Merge "heat api management and template creation functions"