Continue work on the resilient mapper, completing support for fault groups. This commit was SVN r21639.