Merge pull request #1393 from op-jenkins/op-build-update_1120_8-31-2017

op-build update 8-31-2017