[#1830] More merging magic, this time with more ifdefs (STORAGE_ADMIN_ROLE, NETCDF, and OOI_CI)