Make 4.2.1/content pass 99-policy.t
Merge branch '4.2/4.2.1-upgrade-policy' into 4.2-trunk