Refs #16960 EEA; jslint fixes