Merge pull request #914 from op-jenkins/op_update_05_3-10-2017

op-build update 3-10-2017