[trunk] Update BSD-4 copyright into a BSD-3 copyright
Fixes issue 300
[trunk] Explicitely reject file4/file6 scenario
Update issue 286