Merge pull request #478 from op-jenkins/op_update_5-17-2016

op-build update 5-17-2016