Removing trash file
Rebase from 'upstream'
Added install rule for package.xml
Removing trash file