Upgraded to 2.2.0
Merged changes for Eclipse plugin 2.2.0