MergeVar refactored slightly
Extended message methods are replaced
Consistent API with render change to List of MergeVar (rather than a map)
Template render api test changes