Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop