Merge "BUG-868: remove InstanceIdentifier.getPath() users"