Merge "Move to C++ Fstab class"