Merge "Increased jenkins gating jobs build retention policy"