6982137: Rebranding pass 2 - missed copyright changesReviewed-by: mbykov
6910490: MatteBorder JScrollpane interactionReviewed-by: alexp