Merge commit 'bfb4992f190b1f93e70d2102f35f8df019406758' * commit 'bfb4992f190b1f93e70d2102f35f8df019406758': Adding a system property to log slow queries
Merge commit 'bfb4992f190b1f93e70d2102f35f8df019406758' * commit 'bfb4992f190b1f93e70d2102f35f8df019406758': Adding a system property to log slow queries