Fixed context in tools:reset-password
Prefer slug if both parentId/slug specified
- Will no longer throw an exception / end import if both present
Fix name access points field in adv. search

Fixes #6690
Allow multiple GMD values in CSV import

Using pipe delimiter. Fixes #6692
Allow adv. search over reference code, fixes #6695
Refactor and optimize digital carousel ref #6675

- Digital object carousel should NOT timeout now on
large fonds with many images.

- The digital object carousel will now properly limit
number of images displayed.

- Code is now much cleaner / refactored to remove duplicate
and unnecessary code.

- Code now uses raw SQL in some of the slowest parts

- AtoM will now cache ORM objects instead of constantly
rehydrating new ones in the Acl.
Fix exception if 0 descendent images
Add more data to info objects in ES, fixes #6696

Digital object filename
Physical objects
Title statements of responsibility
General notes
Alpha-numeric designation notes
Conservation notes
Physical description notes
Continuation of Title notes
Make carousel total count include drafts ref#6722
- Also fixed a minor bug in a rare case where IN()
  was empty in a SQL query.
Create physical object type on import ref #6755
Disable nested set for digital_object ref #6635
Make descendants export odd notes in EAD ref#6739
QubitDigitalObject: make timeout configurable, refs #6549
Update mods->repository, fixes #6593

identifier and repository not being referenced correctly in export of <physicalLocation>
add MODS import config, refs #4303

This should enable basic MODS import - focusing on roundtripping files created in AtoM (no elements added beyond existing template).

The exception is language of material - I couldn't figure out how to import language based on the name rather than code.
enable mods import, refs #4303

This just uncomments the reference to mods, which was causing the 500 error reported in #4303
Escape quotes on custom container type ref #6787
Fix warnings caused by 0 ancestors ref #6836
Merge branch '2.x' of git.artefactual.com:atom into dev/issue-6643

Conflicts:
	plugins/arElasticSearchPlugin/config/mapping.yml