Merge branch '1.2rc'

* 1.2rc:
  Update CHANGELOG for 1.2.19
  Fix for CVE-2013-0155
Merge pull request #163 from haus/add_helper_tasks_to_node

Add helper tasks to node namespace
Merge branch '1.2rc'

* 1.2rc:
  Update VERSION for 1.2.20 release
  Remove CHANGELOG file, update version link
Node and Group parameters rake tasks should not create duplicate entries. Fixes #13867, updates commit 0108c040 to behave as intended.
(#17914) Store FlashHash as a normal Hash in session

This patch is a backport of:

https://github.com/rails/rails/commit/36376560fdd02f955ae3bf6b7792b784443660ad

In the form of a monkey patch in the puppet-dashboard initializer stage.

This is required to allow puppet-dashboard to co-exist with other applications
that do not have the full rails stack in their namespace. Without it, other
non-rails applications (such as the certificate service and live management)
are unable to unmarshal cookies created in Rails. Instead, they invalidate the
session and we start to see weird authentication glitches in the GUI.

In essence this patch ensures that when the FlashHash data is stored in a cookie
it is stored as a normal Ruby Hash, as apposed to an
ActionController::Flash::FlashHash. As all other Ruby applications should be
able to unmarshal a Hash, this will avoid the Marshal.load method in
Rack::Session::Cookie from throwing a NameError exception.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #168 from kbarber/ticket/master/17914_serialize_flash_as_hash

(#17914) Store FlashHash as a normal Hash in session
Merge pull request #166 from sodabrew/patch-9

Node and Group parameters rake tasks should not create duplicate entries
Check that the reports import dir exists, is a directory, is readable. #18512
puts is STDOUT.puts
Change deprecated 'ftools' to 'fileutils'.
Daemonize in the Debian / Ubuntu server init.
Merge pull request #171 from sodabrew/patch-12

Daemonize in the Debian / Ubuntu server init
A new implementation of jquery.placholders is now used. This fixes the problem with placeholder emulation in browsers that already support HTML5 placeholders, and there's a known workaround for placeholder support in forms submitted with ajax.
Merge pull request #162 from fhrbek/placeholder

A new implementation of jquery.placholders
Merge pull request #172 from haus/cve-2013-0333

Add an OkJson backend and remove the YAML backend
Update VERSION to 1.2.21
Merge branch '1.2rc'
Upgrade to Rails 2.3.17
Upgrade to rack 1.1.6
Upgrade json_pure to 1.5.5