Merge remote-tracking branch 'origin/unstable' into ratul
starting to add support for templates in nx-os
unit test for peer templates
merging with unstable
merge with unstable
bug fix in template parsing
fixed lexer issue where ip[v6] prefixes could not be neighbor names (nxos)
lexer formatting, alphabetization where no side-effects