Merge "Add structure test for ContentHandler::makeEmptyContent()"