change USER* for USER*EXTRA
merge keywords from libreswan; re-organize, and enable obsolete keywords to be processed
whitespace changes