Merge pull request #853 from op-jenkins/op_update_05_2-6-2017

op-build update 2-6-2017