Support profiles only in the creds profile

In order to properly support the shared credentials file.
Merge branch 'shared-creds-profiles' into develop

* shared-creds-profiles:
  Support profiles only in the creds profile