Various licensing and import fixes
go fmt
Remove some unnecessary licensing changes
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