Rectification of the difference between configuration trees in upstream and downstream

Upstream adds CFME prefix in Configuration and (current) suffix on default zone