refs #470: figure with caption and/or title was not converting into valid cnxml.  title must the first child of figure and caption must be the last.
remove redundant xsl:if