Merge "Fix NPE in VLAN Bindings deletion"