Pull request for: #1211 - fixing problems with CPS switch to HTTPS (and redirect )

also switching common config to point to our dataproxy