Expand CirrusSearchMappingConfig hook a bit to make it useful

Change-Id: I279856653b99a2d42bd54860aa4c9b1f927748bf