CB-7452 Update core properties only if they are defined in config.xml