Making TestContextListenerRegistrator more generic
Merge branch 'master' of https://github.com/clemble/clemble-test.git