Merge "Fix checkstyle warnings in netconf-usermanager"