Merge "BUG-1414: fix InstanceIdentifier.child(Class, Object)"