Merge pull request #1600 from op-jenkins/op-build-update_835_11-1-2017

op-build update 11-1-2017