Merge "BUG-865: do not use InstanceIdentifier.getPath()"