OPENUCB-374: Update develop branch to latest Panopoly git hashes

@cboyden : Let me know when you've finished your tests and we're ready to merge this PR.