Merge "remove obsolete apf properties from platform"