Merge pull request #1266 from op-jenkins/op-build-update_1530_7-21-2017

op-build update 7-21-2017