Finish master -> next (mobx) merge

[steve9164]

Most changes from v7.10.0 to v7.11.5 have been merged from master to mobx (now known as next as of 2020-06-06) in #4466, but there are a few outstanding things to finish to call the merge done:

• [ ] CkanCatalogGroup & Item useCombinationNameWhereMultipleResources (zoran)
  • https://github.com/TerriaJS/terriajs/blob/d35bfb430fbb0a837c2fd2da0917a4498ccebedc/lib/Models/CkanCatalogGroup.js#L124-L129
• CsvCatalogItem chartDisclaimer
  • Also on WMS catalog item
  • Being worked on in #4479
• [ ] GeoJsonCatalogItem:
  • Opacity
    • Changes to billboards and marker url handling
  • PropertyBag change (to fix infinite recursion)?
    • This might not be needed any more. The file that needed the PropertyBag changes before no longer needs it.
• [ ] GlobeOrMap
  • Opacity changes to vector feature highlights
  • diff
• ImageryLayerCatalogItem
  • Various changes to error handling. Completion of #3486 should include these changes on master as it will be designed with respect to master at the time.
  • Delta (implemented separately in next)
  • diff
• BottomDock.jsx
  • Has references to ChartDisclaimer
  • Worked on in #4479.
• [ ] ChartExpandAndDownloadButtons
  • Missing chart disclaimer (part of #4479).
  • diff
  • Need to check if the runInAction where there should probably be a computed is intended here
• ViewingControls
  • Used next over master changes
  • master had only the master delta changes, which are done differently in next
• [ ] TerriaViewer /Leaflet
  • worldCopyJump was changed from false to true as part of the antemeridian changes. Should this be applied in next too?

Also there were at least a couple of models that weren't ported and will be added to the general next backlog:

• GeoRssCatalogItem (being addressed in #4493)
• MapboxStyleCatalogItem

[soyarsauce]

Chart disclaimer being addressed here https://github.com/TerriaJS/terriajs/pull/4479#pullrequestreview-441296995

[nf-s]

Is this done @steve9164