Fixing up the handling of accept headers when the value is a CSV list
Cleans up patch to pass checkstyle rules