pull edx-configuration from private repo

Original pull request: https://github.com/edx/configuration/pull/787

I've submitted the CLA and resolved the merge conflict.