Merge proposals dependent on lp://staging/~fginther/pbuilderjenkins/support-3.0-source-format

1. support-3.0-source-format
2. Dependent merge proposals