CS-4874 - Add / at the end of folder name in htaccess template file & CS-5368-Restore of backup is brake on back-end or terminal