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

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