Cherry-pick packaging changes to 1.1.x

This contains all the packaging changes from master except for the bits about using PE Java.