added npe guard
[CXF-6112] Updating ResourceContextProvider
Removing one of the search module test deps