Vivo 3034 psuedo rebase merge

[wwelling]

Thank you for submitting a pull request! Title this pull request with a brief description of what the pull request fixes/improves/changes. Please describe the pull request in detail using the template below.

---

VIVO GitHub issue: (please link to issue)

• Other Relevant Links (Mailing list discussion, related pull requests, etc.)

What does this pull request do?

A brief description of what the intended result of the PR will be and/or what problem it solves.

What's new?

An in-depth description of the changes made by this PR. Technical details and possible side effects. Include screenshots if appropriate.

Example:

• Changes x feature to such that y
• Added x
• Removed y

How should this be tested?

A description of what steps someone could take to:

• Reproduce the problem you are fixing (if applicable)
• Test that the pull request does what is intended.

Additional Notes:

Any additional information that you think would be helpful when reviewing this PR.

Example:

• Does this change require documentation to be updated?
• Does this change add any new dependencies?
• Does this change require any other modifications to be made to the repository?
• Could this change impact execution of existing code?
• Large pull requests should be avoided. If this PR is large (more than 1,000 lines of codes), please provide short explanation why your contribution can't be decoupled in smaller PRs.

Interested parties

Tag (@ mention) interested parties or, if unsure, @VIVO-project/vivo-committers

Reviewers' expertise

Please add any new expertise in the list which might be needed for reviewing your PR or remove any of the listed if it is not needed.

Candidates for reviewing this PR should have some of the following expertises:

1. Java
2. HTML, CSS, JavaScript
3. FreeMarker
4. SPARQL
5. Ontologies
6. Docker
7. Natural language knowledge
   1. English
   2. German
   3. Spanish
   4. French
   5. Portuguese
   6. Russian
   7. Serbian

Reviewers' report template

Please update the following template which should be used by reviewers.

General comment

A reviewer should provide here comments and suggestions for requested changes if any.

Testing

A reviewer should briefly describe here how it was tested

Code reviewing

A reviewer should briefly describe here which part was code reviewed