merge of 721132: Make the url looks like as it should be if the updatesite documentation has been followed