Fixes the EC2 Auth Token Settings

Previously, the module would create a keystone_ec2_uri parameter
in heat.conf.  This flag does not exist within heat.conf.
Additionally, the auth_uri within [ec2authtoken] would use the
incorrect auth uri (standard Keystone URL instead of the EC2
URI).

Conflicts:

        spec/classes/heat_init_spec.rb

Change-Id: I61bcf59c60617db07eb3fad3e3e23e8fd6ab9eff
(cherry picked from commit 768a4e593e6db8b7948623b9eb3ae840a9ef4ab4)
Merge branch 'stable/havana' of https://github.com/stackforge/puppet-heat into havana