added optional parameter to owner_or_admin? in order to specify the object to check
added optional parameter to owner_or_admin? in order to specify the object to check

mdiebolt/pixie.strd6.com,mdiebolt/pixie.strd6.com