Fix in remote-id option support (bug #299)
Fix for bug 304: multiple vendor-options with same vendor-id are merged
ChangeLog updated.