minor edits for presentation
activeweb-173 Default layout for internal application error is not used even in cases when specified
Merge remote-tracking branch 'origin/master'