Changing GPL/LGPLv3 code to use Apache v2.0 instead
Changing Canonical's GPL/LGPLv3 code to use Apache v2.0 instead
Changing Canonical's GPL/LGPLv3 code to use Apache v2.0 instead.

Approved by PS Jenkins bot, Alan Pope.
Merge branch 'bzr/master'