Merge branch 'master', remote-tracking branch 'upstream/master'
Fix for EZP-21305: Allow object relation attribute to be used in object name pattern as first condition in fallback
EZP-21305: Directly test for attribute existence and content
EZP-21305: Explicit checking of attribute value
Merge pull request #692 from peterkeung/object-name-pattern-object-relation

Fix for EZP-21305: Allow object relation attribute to be used in object name pattern as first condition in fallback