CAP-164 Remove CDNs from URLs, additional minor fixes

Also partial change for CAP-165. Needs more like including underscore (don't use portal underscore since backbone adds to it)