ENGCOM-2167: Fix for #8222 #16491

 - Merge Pull Request #16491 from gelanivishal/magento2:2.1-develop-PR-port-16213
 - Merged commits:
   1. f0a8ba8
   2. f388069

Author: magento-engcom-team

lib/web/mage/collapsible.js

@@ -100,7 +100,8 @@ define([
         _processState: function () {
             var anchor = window.location.hash,
                 isValid = $.mage.isValidSelector(anchor),
-                urlPath = window.location.pathname.replace('.', '');
+                urlPath = window.location.pathname.replace(/\./g, ''),
+                state;
 
             this.stateKey = encodeURIComponent(urlPath + this.element.attr("id"));
 
@@ -113,7 +114,7 @@ define([
                     }
                 }
             } else if (this.options.saveState && !this.options.disabled) {
-                var state = this.storage.get(this.stateKey);
+                state = this.storage.get(this.stateKey);
                 if (typeof state === 'undefined' || state === null) {
                     this.storage.set(this.stateKey,this.options.active);
                 } else if (state === true) {