Merge pull request #907 from op-jenkins/op_update_05_3-6-2017

op-build update 3-6-2017