url changes to templates and urls [MJ-530]
fixed ss tests [MJ-530]
fixed test [MJ-530]
merged with url-normalize-ss