am 3583bc84: Merge "Revert "mako: add \'journal_async_commit\' into fstab.mako"" into jb-mr1-dev

* commit '3583bc845e86dd2ae0d192a4fb3b3594008bf621':
  Revert "mako: add 'journal_async_commit' into fstab.mako"