Merge pull request #1265 from op-jenkins/op-build-update_1128_7-21-2017

op-build update 7-21-2017