Merge "xci: Enable deployment and testing for post merge jobs"