Revised v2 templatemap resource and endpoints. bugid:112489