Handle ip addresses from redirect (they come as comma separated list)
Allow a template to be duplicated - otherwise an incorrect error is returned
saying that the metadata record has been deleted or inaccessible
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x