CMS-4662 Replace use of createUrl functions to use new functions.