[CLOUDSRV-2281] Minor update to adapt enterprise Push environment
Merge pull request #4212 from realpaul/3_1_X

[CLOUDSRV-2281] Minor update to adapt enterprise Push environment