(maint) Add RHEL7 to list of mocks to build against

Only adding for RHEL7 x86_64, since there is currently no 32-bit RHEL7 platform.
Merge pull request #878 from mckern/1.5.x

(maint) Add RHEL7 to list of mocks to build against
(maint) Point RHEL7 build_default entry to x86_64, not i386

Previous commit pointed at i386 by mistake.
Merge pull request #879 from mckern/1.5.x

(maint) Point RHEL7 build_default entry to x86_64, not i386
(maint) Updated RHEL7 support in 1.5.x branch

These changes should fix packaging for RHEL7 and allow RPMs to
be cleanly assembled again.
Merge branch '1.5.x' into 1.6.x

* 1.5.x:
  (maint) Updated RHEL7 support in 1.5.x branch
  (maint) Point RHEL7 build_default entry to x86_64, not i386
  (maint) Add RHEL7 to list of mocks to build against

Conflicts:
	ext/build_defaults.yaml
	ext/redhat/puppetdb.spec.erb