Merge pull request #1719 from op-jenkins/op-build-update_043_12-15-2017

op-build update 12-15-2017