VIVO-682 BETTER Fix display of self-editor level properties

Need to test for the property itself as well, because the property statement tests don't allow for faux properties.
Of course this means that a self-editing faux property will not be shown if its parent property is hidden.
Merge branch 'maint-rel-1.6' into develop