Merge "Revert "mako: add 'journal_async_commit' into fstab.mako"" into jb-mr1-dev