[1.5] Update BSD-4 copyright into a BSD-3 copyright
Update issue 300
[1.5] Remove simple warning about C++ style comments
[1.5] Remove another set of simple warnings