Backported fix of minimal (empty hashmap) leak on redeploy (#9993)

Change-Id: I9933c21ab8449378269c577c9622d75586590e45
Merge: no
Remove resource related code from VaadinPortlet (#11527)

Change-Id: I33f489922bab432d1d85f4d46b73df8bd89ae91c
Merge: no
Merge commit '2b5f6ccc1e9ae5c9c8c88dc3195020eaa27a3be6'

Change-Id: I1b5502cfe7891ca52806bf1f2204d92f9cff14b1
Merge commit 'c0bf2608dd23051f11f2a031e08aebbfdf7b5472'

Change-Id: I4bf49b564c1195e2123a636bbe5daad2343a68c7