6943119: Rebrand source copyright notices
Reviewed-by: darcy

6657499: javac 1.6.0 fails to compile class with inner class
Summary: Lookup of member inner classes silently fails leading to an unwanted erasure to take place
Reviewed-by: jjg