Implement changes proposed for common annotations 1.2 maintenance release

I'm not clear on the legal issues just yet, so the copyright and all is left clear until we get clarification.  Otherwise we should probably release some kind of 1.2 spec beta I guess?