master
8310643: Misformatted copyright messages in FFM
8327460: Compile tests with the same visibility rules as product code