Merge pull request #2960 from abarth/use_packages

Use --packages rather than --package-root