- correct wrong xml deployment name.
- correct plugin tasks condition
- Removed old variable reference with new ones
- Correct p2 plugin