This patch fixes disksup:get_disk_data for SUSv3, specifically OS X ML

On OS X Mountain Lion, the default output of df command includes iNode
used and iNodes free, which apparent what SUSv3 specifies. This breaks
the current parse logic and reports incorrect results. This patch adds
support for the new format and ensures older versions of OS X produce
this format by adding the -i switch (which is now the default). Adding
support for this new format rather than changing df output as we'll
presumably see this on other platforms eventually.
compilation fix for NetBSD

taken from a pkgsrc patch: patch-lib_os__mon_c__src_memsup.c
Moved ifdef NetBSD to proper place
Merge branch 'sm/fix-disksup-susv3/OTP-10945' into maint

* sm/fix-disksup-susv3/OTP-10945:
  This patch fixes disksup:get_disk_data for SUSv3, specifically OS X ML
Merge branch 'yt/netbsd/OTP-10941' into maint

* yt/netbsd/OTP-10941:
  Moved ifdef NetBSD to proper place
  reduce bashism
  compilation fix for NetBSD
  compilation fix for NetBSD
[os_mon] Quote path to programs run with open_port({spawn,...

This is to allow space in the path.
Convert XML files to UTF-8
Quote windows paths with spaces
Merge branch 'siri/spawn-and-space'

* siri/spawn-and-space:
  [sasl] In test, quote erlsrv executable in call to open_port/2
  [test_server] Quote path to erl executable when starting slave nodes
  Quote path to erl executable in slave to allow space in path
  [sasl] Quote path to program run with open_port({spawn,...
  [os_mon] Quote path to programs run with open_port({spawn,...

Conflicts:
	lib/os_mon/src/nteventlog.erl
versions updates for erl_interface, et and os_mon
Merge branch 'maint'