Add support for query action timeout

This version adds support for a timeout parameter to the query action so that if you have a very long running query, you can extend the default 10 second timeout.