Use dict comprehensions

Merged Dmitry Volodin requested to merge noc-dict-comprehensions into master

Merge request reports