[xwiki-devs] Merge XWIKI-5296 and XWIKI-6546 in 2.7 branch

Hi devs, I know 2.7 is a bug fixing branch but I need these two new features for a project that will use XE 2.7.2 (to be released soon). The changes are pretty safe. Let me know if you are against it. Thanks, Marius