Merge pull request #1598 from op-jenkins/op-build-update_1110_10-31-2017

op-build update 10-31-2017