Update content-negotiation config handling

- per zfcampus/zf-content-negotiation#1 -- updates `accept-whitelist` to
  `accept_whitelist`, and `content-type-whitelist` to `content_type_whitelist`
Merge branch 'hotfix/content-negotiation-update'