More changes to the User Guide, including changes to common files

bug: #1110146

Change-Id: Ifb3e3f464baa611a99cc6a5b62907cdfe52856ad
author: diane fleming
Adds computeconfigure.xml back.

Change-Id: I395c4363b441142c8e4cf69aaa26bee5c6735faf
Merge "More changes to the User Guide, including changes to common files"