Added install rule for package.xml
Rebase from 'upstream'
Integrate patch file used in dry version.
Added install rule for package.xml