CLC-3150 Fix timeout log messages for Canvas proxies
CLC-3150 Use safe_json; log warning messages from Canvas import
Merge pull request #2032 from raydavis/raywip

CLC-3150 Fix timeout log messages for Canvas proxies