Merge "Update kernel configuration to support cilium"