Merge "Remove deprecated recovery.fstab." into jb-mr2-dev