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.
Merge branch 'dg/win_icon' into pu
Merge branch 'sk/odbc64' into pu
Merge branch 'rc/break-out-asserts' into pu
Merge branch 'mh/fix-emacs-pkg-flymake-dep' into pu
Merge branch 'an/http11_content_length_zero' into pu
Merge branch 'mh/cdv-osx-default-browser' into pu
Merge branch 'ats/observer_tv_improper_lists' into pu
Merge branch 'as/tls-psk-srp-suites-ECC' into pu
Merge branch 'sm/fix-disksup-susv3' into pu