jf: Remove "discard" mount option

 * The new fstrim service handles this now to fix performance issues
   caused by using the mount option.

Change-Id: I3cae7a942d91d61f67892e1db4075335e01eca95