Merge pull request #3482 from CityOfBoston/master

(production) Site/Emergency Alerts and Drupal Maintenance

.gitignore

@@ -49,6 +49,9 @@
 .phpunit.result.cache
 patches.lock.json
 
+#Ignore HTTPS (REST) test configs
+/tests/http-client.env.json
+
 # Ignore logfiles from setup
 /setup/*
 /setup/private/*

composer.json

@@ -81,10 +81,10 @@
         "drupal/ckeditor": "1.0.2",
         "drupal/coder": "^8.0",
         "drupal/colorbox": "^2.0",
+        "drupal/config_filter": "*",
         "drupal/config_ignore": "^3.2",
         "drupal/config_split": "^2.0@RC",
         "drupal/config_update": "^2.0@alpha",
-        "drupal/config_filter": "*",
         "drupal/conflict": "2.0.0-alpha3",
         "drupal/contact_storage": "1.3.0",
         "drupal/content_access": "^2.0@RC",
@@ -115,7 +115,7 @@
         "drupal/field_group": "^3.0",
         "drupal/file_entity": "^2.x-dev",
         "drupal/file_mdm": "^2.2.0",
-        "drupal/geolocation": "^3.0",
+        "drupal/geolocation": "3.12",
         "drupal/google_tag": "^1.0",
         "drupal/honeypot": "^2.1",
         "drupal/image_url_formatter": "^1.0",