cddl/contrib/opensolaris: Various misc fixes

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>