Multiple FreeBSD fixes

- Fixup ovf-env.xml file broken by customdata
- Fix new DistInfo() function for FreeBSD
- Squelch a few (ignorable) errors in the log
FreeBSD: bail out when provisioning as DISK
Force ascii encoding for FreeBSD ovf-env.xml file
Merge remote-tracking branch 'upstream/2.0' into freebsd

* upstream/2.0:
  Suppress spurious logging for non-JSON handlers.
  Clarify loop expression
  Fix launchCommand() timeout loop
  Check exit code in launchCommand()
  GetHandlerState: default to 'NotInstalled'
  Add state handling to handler processing
  Clarify loop expression
  Fix launchCommand() timeout loop
  Check exit code in launchCommand()
  SLES12 fix for wickedd-dhcp4
  GetHandlerState: default to 'NotInstalled'
  Add state handling to handler processing
Merge branch 'freebsd' of https://github.com/szarkos/WALinuxAgent into freebsd

# By Stephen A. Zarkos
# Via Stephen A. Zarkos
* 'freebsd' of https://github.com/szarkos/WALinuxAgent:
  Force ascii encoding for FreeBSD ovf-env.xml file
  FreeBSD: bail out when provisioning as DISK
FreeBSD: Strip non-XML data from ovf-env.xml file
Merge pull request #34 from szarkos/freebsd

Multiple FreeBSD fixes
Support for global and local CommandExecution.log for extensions.
Merge branch '2.0' of https://github.com/Azure/WALinuxAgent into 2.0

Conflicts:
	waagent