renamed o.b.ops.ws.* packages to o.b.uri.ws.*
Merge branch 'master' into nov-profile-prototype
Moved files missed by merge