[jboss-jira] [JBoss JIRA] (ELY-91) Unify mechanism selection and fix the tests