Merge branch 'epcc-patch'

guacamole/src/main/frontend/src/app/storage/services/localStorageService.js

@@ -121,6 +121,8 @@ angular.module('storage').provider('localStorageService', [function localStorage
 
         // Pull and parse value from internal storage, if present
         var data = storedItems[key];
+        if (!data || data === "undefined")
+            return null;
         if (data)
             return JSON.parse(data);