refs #master Merge branch 'origin/master' into 13828-trash-view

refs #master Merge branch 'origin/master' into 13828-trash-view

# Conflicts:
#	package.json
#	src/models/container-request.ts
#	src/models/resource.ts
#	src/services/collection-service/collection-service.ts
#	src/services/services.ts
#	src/store/navigation/navigation-action.ts
#	src/store/project/project-action.ts
#	src/store/project/project-reducer.test.ts
#	src/store/project/project-reducer.ts
#	src/store/side-panel/side-panel-reducer.ts
#	src/store/store.ts
#	src/views-components/context-menu/action-sets/collection-action-set.ts
#	src/views-components/context-menu/action-sets/collection-resource-action-set.ts
#	src/views-components/context-menu/action-sets/project-action-set.ts
#	src/views/favorite-panel/favorite-panel-item.ts
#	src/views/project-panel/project-panel-item.ts
#	src/views/workbench/workbench.tsx

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>