Rectification of the difference between configuration trees in upstream and downstream
Merge pull request #758 from mfalesni/up_down_conf_tree

Rectification of the difference between configuration trees in upstream and downstream