Merge "Fix features for netconf userfeatures"