Cleanups, add missing configs, formatting

Merged Vadim Seregin requested to merge seregin/ECM:CLEANUP into master

cleanups, add missing configs, formatting

Edited by Vadim Seregin

Merge request reports