Merge "Add some netdutils socket option helpers"