Login form changes for theming updates.  Some headings moved into theme templates.
Merge commit '211c39f6afb62e5009f765c73c6c0027db5f96b6' into theming-updates
Login form simplified for AAF.