fix civicrm-sql-connect and civicrm-sql-query commands
Merge branch 'CRM-14359' of https://github.com/joelcollinsdc/civicrm-drupal into joelcollinsdc-CRM-14359
Merge branch 'joelcollinsdc-CRM-14359' into 7.x-master