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