CLC-2018 - Setting menu has extra margin since last Foundation update
https://jira.media.berkeley.edu/jira/browse/CLC-2018
Merge pull request #1171 from christianv/CLC-2018

CLC-2018 - Setting menu has extra margin since last Foundation update
Merge remote-tracking branch 'ets/master' into reformatuser

* ets/master:
  CLC-2018 - Setting menu has extra margin since last Foundation update https://jira.media.berkeley.edu/jira/browse/CLC-2018
test