Roll up gitpillar changes to 2014.1.5 version
Roll up gitpillar changes to 2014.1.5 version
Merge pull request #13907 from cro/master_tops_fix2

roll up gitpillar changes to 2014.1.5 version