Merge pull request #1526 from op-jenkins/op-build-update_1040_10-5-2017

op-build update 10-5-2017