Merge pull request #986 from op-jenkins/op_update_1642_3-28-2017

op-build update 3-28-2017