bug #4057 db/table query string parameters no longer work

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
Add FAQ reference

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix merge conflicts

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '783e28f' into QA_4_3
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'QA_4_3'