Merge "Bug2174: XSQL log file is hardcode to /tmp/xql.log" into stable/helium