Merge pull request #2243 from ctweney/clc-3410-7

CLC-3410 Seventh batch of proxy reorg: Canvas
CLC-3410 Move lib/canvas/* into app/models/canvas
CLC-3410 Put Canvas classes into Canvas:: module
CLC-3410 Shorten Canvas class names