Merge pull request #984 from op-jenkins/op_update_05_3-28-2017

op-build update 3-28-2017