Merge "Revert "Update builder image for netconf-userfeatures""