Bit of work on #613, sort the JMX headers first alphabetically misc properties at the end of the list.  Also fix #696.