wls_deployment type
OIM & OAM support
update for OIM
Merge remote-tracking branch 'upstream/master'