removed ConfigurationHolder as its been deprecated
removed unneeded dependencies that were conflicting plugins
Merge branch 'release/2.0.16' into develop