Merge pull request #949 from op-jenkins/op_update_05_3-21-2017

op-build update 3-21-2017