Merge r1609938 from trunk: core: Include any error notes set by modules in the canned error response for 403 errors. Submitted by: trawick Reviewed by: minfrin, rjung