bug 999433 - Enable optional CORS headers for underscore versions of makes