6943119: Rebrand source copyright notices
Reviewed-by: darcy

6660289: declared bound in inner class referring a type variable of the outer class
Summary: NPE caused by a defect in type-variable attribution
Reviewed-by: jjg