Fix v6r11 rms 140409

First fix is due to a bad merge of mine, apologies
Second one (SRM2Storage) fixes a very old bug (all processes were sharing the same temporary file dirac_directory!!!)