engine: rename QueryData2 to QueryData (5/N)

There is no QueryData class, so there is no reason the have a second
version of it.

Change-Id: I09ee1504bae1fca5e171279ce6c3f58dd3cae474
Signed-off-by: Laszlo Hornyak <lhornyak@redhat.com>