New fix for ERRAI-689: EnabledByProperty annotation should not be a scope