Merge pull request #1357 from op-jenkins/op-build-update_1842_8-18-2017

op-build update 8-18-2017