Consolidate cloud configuration

Previously, there were two beans that both were annotated for the
cloud profile.  Instead of this redundant declaration, both of the
beans have been moved into a single inner class that is annotated for
the cloud profile.
Merge branch 'cloud-configuration'