Ubuntu 14.04

I couldn't come up with a way that didn't require special checking for the key in that merge section.  In particular, I'd like to override per-role, per-version.  So it'd be a level deeper than we currently support.  If you have a clean way to do it, I'm quite open to it.  I found it easier to leave the existing resolution logic in place and use a new key.