Merge pull request #445 from op-jenkins/op_update_4-22-2016

op-build update 4-22-2016