[hopefully] semantics-preserving grammar cleanup
use modes now for des and sha1 hashes
Merge remote-tracking branch 'origin/ratul' into unstable

Conflicts:
	projects/batfish/src/batfish/grammar/cisco/CiscoGrammarCommonLexer.g4