1103330 - updating various functions and unit tests to support docker images have multiple leaf layers and parents having multiple child layers