XMLFileBacked: Fixed multiple identical XIncludes in one file
XMLFileBacked: removed unused variable
Remove all ACLs (including mask) from entries with no ACLs listed

When installing an entry with no ACLs specified, but with ACLs on the
file as it exists on the filesystem, the ACL mask was preserved, even
as the ACLs are deleted.
CfgPublicKeyCreator: properly handle case where only private key has been created

Previously, only two cases were handled properly: both public and
private keys had been created; or neither had been created.  If the
private key had been created (e.g., manually added to the repo), the
public key would not be created from it.  This fixes that.
Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPublicKeyCreator.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
testsuite: Fixed CfgPublicKeyCreator tests

Instead of mocking get_filename, use its normal functionality.  This
avoids a messy situation where we have to mock out a **magic call,
which py2.5 doesn't like at all.
Merge branch 'maint'