Merge "Add robustness to mkdir" into tizen