Bug 1585 - switch features removed after node updated

- use tx.merge rather than tx.put when node or nodeConnector is updated

Change-Id: Ib85dff96396d5805d148ed781401abc02a19982b
Signed-off-by: Martin Bobak <mbobak@cisco.com>
Merge "Bug 1585 - switch features removed after node updated"