Add missing properties in the default xwiki.properties and cleanup a bit
(cherry picked from commit 8d499a0f628ed97b371b4e96dc4b308897f2dc67)