OS-3068 libnvpair JSON output broken by lint fixes