LPS-40736 Normalize newly created staging URLs as well
LPS-40736 Source formatting - inlining new method to reduce complexity since I don't think it adds enough value.