[FELIX-4338] Incorrect overwriting of properties that have not been changed

Fixed by incorporating FELIX-4342

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1547770 13f79535-47bb-0310-9956-ffa450edef68