Merge remote branch 'upstream/maint'

* upstream/maint: (56 commits)
  SYSV: add a migration tool to change simplename attributes to simplefile
  doc: Update SYSV datastream format docs
  SYSV: change instances of simplename to simplefile
  Client/Tools/APT: handle exceptions gracefully
  Server/Plugins/Packages: add debsrc attribute to url_map
  schemas/packages.xsd: add default value for debsrc
  doc: Fix typos
  doc: Add note about Decisions fix for 1.3.6
  testsuite: Fix tools __init__.py unit test
  Tools: Fix install of non-whitelisted services
  doc: Add 1.3.6 release notes
  fix keyboard interrupt during intial event handling
  Server/Core: also shutdown on exceptions during fam blocking
  Reporting: better exception handling
  Packages: add name to additional_data for Sources
  Packages: add name to sources
  YUM: Add options to enable and disable Yum plugins
  Proxy.py: Pass through SSL protocol option
  Reporting: fix filter urls
  doc: Clarify debian bcfg2 versions
  ...

Conflicts:
	debian/changelog
	doc/conf.py
	doc/releases/index.txt
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/sslca.txt
	misc/bcfg2-selinux.spec
	misc/bcfg2.spec
	osx/Makefile
	osx/macports/Portfile
	schemas/packages.xsd
	solaris-ips/MANIFEST.bcfg2-server.header
	solaris-ips/MANIFEST.bcfg2.header
	solaris-ips/Makefile
	solaris-ips/pkginfo.bcfg2
	solaris-ips/pkginfo.bcfg2-server
	solaris/Makefile
	solaris/pkginfo.bcfg2
	solaris/pkginfo.bcfg2-server
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Client/Tools/Action.py
	src/lib/Bcfg2/Client/Tools/SYSV.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Reporting/Collector.py
	src/lib/Bcfg2/Reporting/templates/base.html
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/settings.py
	src/lib/Bcfg2/version.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py