Merge pull request #1578 from op-jenkins/op-build-update_1118_10-20-2017

op-build update 10-20-2017