Remove duplicate owner type comparisions.

Signed-off-by: Malahal Naineni <malahal@us.ibm.com>
Merge branch 'tp/lock.upcall' into ibm_next_20_tmp
Merge branch 'tp/dup.compare' into ibm_next_20_tmp