[RFC] Nelmio rebase 1.7

Visibility PR.  Upstream had a new tag added consisting mostly of features that we created the day after the last rebase-catchup.

This will need to be a manual merge again, which I will complete after a few more clean test runs.

/cc @ajessu