Merge pull request #1019 from op-jenkins/op-build-update_05_4-12-2017

op-build update 4-12-2017