Adjust for checkreq in AtlasPolicy-01-08-15 and fix other checkreq warnings. (CollectionBase-00-02-02)