Merge pull request #3592 from RosettaCommons/fordas/structure_store_fixes Fix structure_store test and build failures.