Fix capabilities inconsistency.

Fix a device variation capability inconsistency that could occur if
non-retina iPhone was requested in combination with the 7.0 SDK.  Rather
than automatically changing the default in such a case, always set a
working default if no device variation is specified, and throw an
exception if iPhone/7.0 is explicitly requested by the client.
Miscellaneous editing fixes.