Merge pull request #1281 from op-jenkins/op-build-update_114_7-27-2017

op-build update 7-27-2017