STORM-80 : Tested changes for making sure that datadir is present