Scaffold controller tweaks#520

stephenfin wants to merge 2 commits intok-orc:maink-orc/openstack-resource-controller:mainfrom

shiftstack:scaffold-controller-tweaksshiftstack/openstack-resource-controller:scaffold-controller-tweaksCopy head branch name to clipboard