Plugin Support

...G...... [DEV-3073] Lint reported issue fixes

Merge in AP/plugin-support from feature/DEV-3073-6.4 to release/6.4

* commit '20228bd8e411880a3a0fa16f5bf0fa152932c942':
  ...G...... [DEV-3073] Lint reported issue fixes