fix for duplicate name issue/permalinks
Merge remote-tracking branch 'remotes/origin/B2497' into develop

Conflicts:
	catalog/install/includes/classes/upgrader.php