Merge remote-tracking branch 'upstream/master'

src/adql/parser/ADQLParser.java

src/adql/parser/ADQLParserConstants.java

src/adql/parser/ADQLParserTokenManager.java

src/adql/parser/adqlGrammar.jj

src/adql/translator/JDBCTranslator.java

src/tap/config/ConfigurableTAPFactory.java

src/tap/db/JDBCConnection.java

test/adql/parser/TestADQLParser.java