Feature 5685 - Allow Terms of Services per domain
Feature #5685 :
- renaming some new setting bundle keys
- adjusting some code
- preventing from a null pointer exception (this prevention has fixed a unit test that was in error)
Merge branch 'feature-5685-from-pierre-teissonniere's-work'