Fixes bad merge issue with ownership check

USERGRID-1046