JAXB marshaller is not thread-safe.
Added TODO to fix wsearch tokenizer (perform exact match).
Merge branch 'upstream' into upstream-rpslvariant

* upstream:
  Added TODO to fix wsearch tokenizer (perform exact match).
  JAXB marshaller is not thread-safe.