Merge pull request #1583 from op-jenkins/op-build-update_043_10-24-2017

op-build update 10-24-2017