Revert "Merge branch 'newconfig' of github.com:robhudson/svcops-puppet into newconfig"

This reverts commit b0432617375754fe6306c7bb76bbb920636bca71, reversing
changes made to 4ce230c9aa4e03f24f63cd963a0c898b0eb45492.