Merge "Change help test generation to use clearsilver templates just like the rest of the system.  This should more easily allow customization of the generated output."