Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally

(you don't have to re-map your port to the correct folder)
Merge branch '6.0.7' into 6.1.2

Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj