Stabilize dnsmasq-nova hash

* dnsmasq-nova.conf using the sort.map trick

Change-Id: I2bdd667908779bc9099bcb07ad8547b5d12286be
ganglia_view.json.erb variable qualification

As various other patches already submitted, this prepends the @ in front
of various variables passed by puppet to the ERB as the are instance
variables now

Change-Id: I87a8a1a66950e1d0ddf19158291b9eaff9caf016
Merge changes I87a8a1a6,I2bdd6679 into production

* changes:
  ganglia_view.json.erb variable qualification
  Stabilize dnsmasq-nova hash