[#1404] Should reduce cppcheck errors
[#1732] Removed STORAGE_ADMIN_ROLE ifdefs, as we always turn it on