Issue #173: Converts contact module categories to CMI
Merge branch '1.x' of github.com:backdrop/backdrop into 1.x