Merge pull request #1268 from op-jenkins/op-build-update_728_7-23-2017

op-build update 7-23-2017