Fixed issue with base template inheritance in user layout template and list view and edit templates.
Merge branch 'HotFix_60' into aws_staging