Merge pull request #796 from op-jenkins/op_update_05_1-6-2017

op-build update 1-6-2017