Merge pull request #1073 from op-jenkins/op-build-update_05_5-11-2017

op-build update 5-11-2017