added new getter getTemplateName, use instead of getTemplate
Make sure that the correct action is used based on the page object instance type
Merge branch 'refs/heads/master' into 2.1