merged all four previous PRs together, added lockfile update
Contributor License Agreement adherence:
[x] This Contribution is under the terms of Individual Contributor License Agreements (and also Corporate Contributor License Agreements to the extent applicable) appearing in the Apereo CLA roster.
merged all four previous PRs together, added lockfile update
Contributor License Agreement adherence: