Merged templates from bundlerepo [branch:422866-Spring-Framework-Templates]