refs #530: fix aloha's zero length @id.
refs #530: update cnxml to structure html conversion for figure
whitespace
whitespace
Merge branch 'feature530' into testing