Merge "BUG-579: improve code readability in RestconfUtils."