RHEL 7 and Fedora 20 uses firewalld by default so iptables
rules were not being persistent through reboots.
This patch disables firewalld so we can continue using the
iptables rules while we come up with an integral workaround.
Fixes: rhbz#1099840
Conflicts:
packstack/puppet/templates/horizon.pp
Change-Id: I123e546721632f52430288352c87c4b33d6328ec