NOJIRA:  Fix license and NOTICE issues