4.2.10 release

Signed-off-by: Marc Delisle <marc@infomarc.info>
bug #4562 [security] XSS in debug SQL output

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
bug #4563 [security] XSS in monitor query analyzer

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
4.2.10.1 release

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '319aac3' into QA_4_2
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit 'd0e3ab3' into QA_4_2