Merge branch 'maint'

Conflicts:
	doc/appendix/guides/centos.txt
	doc/server/plugins/grouping/metadata.txt
	setup.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Lint/Validate.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/SSHbase.py
	src/sbin/bcfg2-lint
Merge branch 'master' of https://github.com/Bcfg2/bcfg2
Replaced XMLSrc with StructFile

XMLSrc and StructFile were very different implementations of basically
the same thing.  StructFile has gotten lots and lots of improvements,
while XMLSrc, with its wonky, unintuitive interface, has floundered.
This replaces XMLSrc with StructFile (nearly) everywhere, and rebases
everything that inherited from XMLSrc with StructFile.

XMLSrc lives on somewhat in the Pkgmgr plugin's PNode and PkgSrc
objects, where originally inherited from the XMLSrc and INode objects
but are now the only implementation of that older interface.  Pkgmgr
was left as-is because a) it's a little-used plugin; b) it's in need
of a rewrite anyway; and c) it has deep, deep hooks into the guts of
XMLSrc and INode, and rewriting it with StructFile was deeply
nontrivial.
testsuite: updated Statistics tests with new library location
testsuite: Genshi is no longer optional
cleaned up old references to BundleTemplateFile
fixed unit tests
GroupLogic: Updated for new module-level setup object
Encryption: disable more bogus pylint messages
Packages: don't cache package collections with no sources
Merge branch 'maint'
Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/installation/distributions.txt
	doc/server/snapshots/index.txt
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/sbin/bcfg2-server
bcfg2-test: added option to spawn multiple child processes to run tests
(cherry picked from commit 6fcce024d45c0f6312b17c19140272f192f18841)

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	src/lib/Bcfg2/Options.py
	src/sbin/bcfg2-test
Plugin helpers: Add missing import

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Merge branch 'maint'

Conflicts:
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/tcheetah.txt
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
Core: removed duplicate check_acls definition
Plugin/helpers: Remove duplicate _include_tests

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Admin/Xcmd: Use py3k-compatible xmlrpclib

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
doc: Remove static link (removed in 0fc1f472)

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt