CID-1254835 proxy can only be null in a special case
CID-1254834 secStorageVm can only be null in a special case
CID-1116546 Fix resource leak
Merge branch 'bugfix/CID-1254835'
CID-1232335/CID-1232336 Fix potential XSS
CID-1114601/CID-1114602 Fix ignored return values and remove duplicate code