Compilation error fix for duplicate enum variables
Edited patch which included an unintended change to dist-format-astyle.bat.
Add option to delete extra empty lines