Fix SSO acceptance test

This commit also reverts an earlier commit that brought back cloud_controller.read/write in the cf-warden-infrastructure template