Add license
Cherry pick Radda's fix, refs #4381
Cosmetic changes