Code review comment for lp:~dooferlad/linaro-license-protection/remove-direct-license-references

1. remove-direct-license-references
2. Merge into trunk