Merge branch 'HOTFIX-438-node-url-translation'
Merge branch 'HOTFIX-438-node-url-translation'
Add redirects /view for files and publications
Merge remote-tracking branch 'origin/HOTFIX-migration' into develop

Conflicts:
	docroot/sites/all/modules/osha/osha_migration/files.migrate.inc