Fixes .war file creation
Retab and whitespace
Land #2794, @Meatballs1's fix for to_exe_jsp on J7u21, [FixRM #8717]