Tidy up consumer/consumererror
package.
#2768
Merged
consumer/consumererror
package.
#2768