Catch up with upstream's changes to local_settings.py

In the past 6 months, quite a few things have changed upstream. It's
time to catch up and add the changes from local_settings.py.example.

Fixes: bug #1223317

Change-Id: I1fcabdf926263f1c6b6f19acd34ec59bf17283c3
Preparing for 2.2.0 release.

Updated Modulefile version.
Updated README.md release notes.

Closes-bug: #1224770

Change-Id: If3f334c524a56dc9fa65a312897112ce0207fe1c
Merge "Preparing for 2.2.0 release."