Merge pull request #761 from wallyworld/licensing-fixes

Licensing fixes

Various tweaks to address:

https://bugs.launchpad.net/bugs/1368321
https://bugs.launchpad.net/bugs/1368358
Remove obsolete files
Merge pull request #764 from wallyworld/licensing-fixes-trunk

Port licensing fixes from 1.20

Licensing fixes

Various tweaks to address:

https://bugs.launchpad.net/bugs/1368321
https://bugs.launchpad.net/bugs/1368358