Fixing bugs
use sticky temporary dirac_directory file
fix bad merge
Merge pull request #1896 from fstagni/v6r11fixes-2

[v6r11] Fixing bugs
Merge pull request #1897 from phicharp/FIX-v6r11-RMS-140409

Fix v6r11 rms 140409
v6r11-pre13
Conflicts resolved with rel-v6r11