Merge pull request #892 from op-jenkins/op_update_05_2-28-2017

op-build update 2-28-2017