Update the ec2test branch with the latest packages

This is merging everything from master into the ec2 branch. It actually merged cleanly with 924 commits.

@dirk-thomas for review