fix imports and whitespace
Merge pull request #4036 from dimagi/whitespace

fix imports and whitespace
Merge remote-tracking branch 'origin/explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/auto-gps+schedule' into autostaging
Merge remote-tracking branch 'origin/auto-gps' into autostaging
Merge remote-tracking branch 'origin/app-buttons' into autostaging
Merge remote-tracking branch 'origin/es_none_type' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge remote-tracking branch 'origin/refactor-domain-copy2' into autostaging
Merge remote-tracking branch 'origin/logos' into autostaging
Merge remote-tracking branch 'origin/vellum-requirejs' into autostaging
Merge remote-tracking branch 'origin/emwf-refactor' into autostaging
Merge remote-tracking branch 'origin/real-project-spaces' into autostaging
Merge branch 'closecase' into autostaging
Merge remote-tracking branch 'origin/archive-to-deactivate' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging
Merge branch 'cachecomparisons' into autostaging
update submodule refs