Merge "DO NOT MERGE.  Integrate: Include showmap output in bug report." into ics-mr0