Fixed state and property auto generation of role and role inheritance.
Re-inserted some text that was mistakenly removed during editing.
Merge branch 'master' of github.com:w3c/aria