Merge remote-tracking branch 'gerrit/6047_update_rte' into tuleap-stable-master
Merge branch 'master' of tuleap.net:tuleap/tuleap/stable into tuleap-stable-master