Move the fallback / noncanonical bits to v2

As agreed during the 2014-12-15 teleconference
(http://www.w3.org/2014/12/15-webappsec-minutes.html#item07), the
fallback mechanism is moved to a future version.