Merge pull request #1257 from op-jenkins/op-build-update_757_7-18-2017

op-build update 7-18-2017