Change way to get jenkins master url

Merge of two cherry-picks:
b672db706ee580984538c1a63cbf10fc565897c3
5f8e64cd805b6ee71de15b90d6f148055247e44a

Change-Id: I7dece1cf30c1e1fe56388aae4bb939adc1e98417
Related-bug: PROD-26834
             PROD-30275
(cherry picked from commit b672db706ee580984538c1a63cbf10fc565897c3)
1 file changed