Improve logic that determines whether to use accordions
Improve logic that determines whether to use accordions

See https://issues.osehra.org/browse/VIVIAN-362

Also fixed some whitespace

Change-Id: Ib0056dab661e0dce7e111e1764f49df8bcbc1616

josephsnyder/VistA,OSEHRA-Sandbox/VistA,josephsnyder/VistA,OSEHRA-Sandbox/VistA,josephsnyder/VistA,josephsnyder/VistA,OSEHRA/VistA,OSEHRA/VistA,OSEHRA/VistA,OSEHRA/VistA,OSEHRA-Sandbox/VistA,OSEHRA-Sandbox/VistA,OSEHRA/VistA,OSEHRA-Sandbox/VistA,OSEHRA/VistA,josephsnyder/VistA,josephsnyder/VistA,OSEHRA-Sandbox/VistA