mirrored fixes to CSOL-site deployment to butter and openbadges.