add 5 minute timeout to query operation when running parallel
tiny refactoring
fired entry event should include old value after remove if same operation
Merge pull request #4036 from ahmetmircik/improvement/3.3.4/addTimeOut2QueryOperations

Adds timeout to QueryOperation
Merge pull request #4043 from ahmetmircik/fix/3.3.4/removeIfSameEventOldValue2

Fired entry event should include old value after remove if same
Merge remote-tracking branch 'hz/maintenance-3.x' into maintenance-3.x-seeburger