Merge tag '1.1.13.6' into develop

Cleanup to remove issues found when running in strict mode.
lessen the hit on information_schema by selecting by table_schema
tighten up information_schema queries
Merge branch 'release/1.1.13.7'