Merge pull request #909 from op-jenkins/op_update_05_3-7-2017

op-build update 3-7-2017