Merge "Remove the ext4 discard mount option." into jb-mr2-dev