[trunk] Fixes for PList generation with Locations