[bcfg2/el5] (4 commits) ...Merge branch 'master' into el5

[John Morris]

Summary of changes:

  4c7a8e2... Requires: python-django for EPEL7 (*)
  2f9eee1... Fix Release version (already updated in %changelog) (*)
  79aecb5... EL7:  Re-add deps and re-enable %%check script; bz #1058427 (*)
  3539b1f... Merge branch 'master' into el5

(*) This commit already existed in another branch; no separate mail sent