rolling back change RDBQA-4, fixes test
(https://github.com/ml054/ravendb/commit/405852eee3e18542cfb885ad46d4b0d1a82a1d07)
Merge branch 'New3' of github.com:ayende/ravendb into New3