Cherry-picked changes from BuildServerIntegration that are not domain specific to lower amount of possible merge conflicts.