Update to work in standalone mode

- pull in required external dependencies not available via plugin api
- specify the usage of OptionalSubject directly

Change-Id: I4ad404eb0c8dbbb51bef7e59279974609accc478
6 files changed