Merge pull request #1565 from op-jenkins/op-build-update_043_10-18-2017

op-build update 10-18-2017