Fix compatibility with Django 1.6.
Reports: Add missing ImportError

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
bcfg2-crypt: backported fixes in b5b26415161e715fe4d22d69328b06801ff7124d
bcfg2-crypt: Fixed variable name collision
Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Server/Admin/Reports.py
	src/lib/Bcfg2/Server/Hostbase/hostbase/urls.py
	src/lib/Bcfg2/Server/Hostbase/urls.py
	src/sbin/bcfg2-crypt
	tools/upgrade/1.3/migrate_dbstats.py