Merged commits from Angelo:
https://github.com/angelozerr/eclipse-wtp-xml-search/commit/0628a63a5da6fe50ca699b0ad7b8b681bb1bf6e7
https://github.com/angelozerr/eclipse-wtp-xml-search/commit/663132cb9486eed2589b6ece64be9605b1ccefdb
https://github.com/angelozerr/eclipse-wtp-xml-search/commit/5715b32fe282af96330c1c672b5cbf9ccb48d32a