add cf groupings to user prefs page

see issues#http://27333
Merge branch '4.2/user-prefs-cf-groupings' into 4.2-trunk