Merge pull request #533 from bhariharan/unstable

Adding upgrade steps for 2.2.0
Passcode bugfix