refs #499: convert sections from aloha to structured html to cnxml
Merge branch 'ticket499++' into testing