[MIN] Java 8 compatibility
[FIX] [FIX] XQuery: RFC 3986. Fixes #928, closes #938.