Merging property file changes of patches to 4.3.0 branch