Merge "heat api management and template functions parameters"