jflex fixes
Merge branch 'master' of github.com:tarzanek/OpenGrok

Conflicts:
	src/org/opensolaris/opengrok/analysis/sh/ShXref.lex
Merge pull request #737 from tarzanek/master

jflex fixes