VIVO-682 Modify some auth code to work better with faux properties.
Merge branch 'maint-rel-1.6' into develop