Patch Set 15:

I pushed change I65d7607528e29330144fcef0e9b7ec23ea1b4787 for review to fix the other license files.

I filed bug 354300 to track that we should delete the psf-feature when our minimum requirement becomes 3.7