Merge pull request #855 from op-jenkins/op_update_05_2-7-2017

op-build update 2-7-2017