Merge "PackageManager: add versioning to packages.xml file"