[general] collect 'hostname' as well as 'hostname -f'

The --fqdn option to hostname depends on the system resolver
configuration. On hosts where the fqdn is undefined the command
may return:

  "hostname: Name or service not known"

Since hostname will at least give the locally configured name
regardless of resolver or DNS state collect both commands.

Fixes #404.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>