[WIP] Changes to support orchestrate-api config changes.

This isn't really ready yet, but pushing it as to not have something totally broken for the orchestrate-api changes that are in master now. Wait to merge this one, but if you need to work on it locally, pull down this branch/pr.