Merge changes from generator-webapp.