Reconcile jfs with muppets.

Change-Id: I8f0c58957783857cca3207578ca8b987df346b3f
Merge "Reconcile jfs with muppets." into jb43