Merge pull request #2172 from raydavis/qawip

QA CLC-3347 - Revert CLC-3178 changes pending fix for Canvas import inconsistency
CLC-3365 Cache CFV Not Found responses