Use consistent license identifiers, remove redundant package.xml files