Accepting two different URIs for license, also the British spelling of licence
Merge branch 'master' into add_more_licenses

Conflicts:
	vendor/eol_content_schema_v2/MediaResource.php