Consolidate license files.  Still Apache 2.0 everywhere.