DDF-762 Fixed NPE when unexpected token is provided.
(cherry picked from commit 842724f)
DDF-763 Updated pom files to reflect co-released versions.