Merge commit 'eade6849' into staging

# Conflicts:
#	src/main/webapp/WEB-INF/jsp/accession/details.jsp

src/main/webapp/WEB-INF/jsp/accession/details.jsp

@@ -728,7 +728,7 @@
     <script type="text/javascript">
 				jQuery(document).ready(function() {
 					var map = L.map('map').setView([${accessionGeo.latitude}, ${accessionGeo.longitude}], 2);
-					L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
+					L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
 						attribution: 'Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ',
 						maxZoom: 16
 					}).addTo(map);