Merge changes I87b5b309,Id23d941c into studio-1.1-dev

* changes:
  Update adt plugin's manifest to use lombok 0.2.3
  Remove obsolete p2gen folder