Merge "Handle property place-holders in features.xml"