[CDF-386] - Reviewed URLEncoder code duplication and added reference to the common-ui dependency.