Consolidate jf defconfigs