Changes for migration during the travis build process
Merge branch 'secrets_config'

* secrets_config:
  Changes for migration during the travis build process