CB-6472 Merge dictionaries when updating plist files

Merges the dictionaries on plist files if both plist and the value from plugin.xml are dictionaries. This makes it consistent with how it behaves with array values.