fixed references to drafts that have moved to RFC or WG

Merge pull request from Cullen