make thread local variable name singular
add a note
extract a method and add an explanatory note
fix test
upgrade wildfly dependency to 8.0.0.Final