Merge Jenkin related changes from Garwood_test branch to master