Fixed an issue with merge() and unmodifiable PropertySets.

Change-Id: I84549088cc4c005847291eb80358c3c48327e0eb