Update headings plus edits for consistency and clarity in End and Admin User Guides

Partial-Bug: #1250515

author: diane fleming

Change-Id: I0ae7f3da1ef0bf9af4900097d527e2cd7b94c966
backport: havana
Fix outstanding conflicting os profiling.

Found a few more instances where child nodes had conflicting os
profiling values to their parent nodes.

Change-Id: I666ea00f15b3d1bd184cd4d907652376c477d74b
backport: havana
test.py: Improve output

Remove the output of the namespace from verify_no_conflicting profiling.

Change-Id: I1d1eb4e3fd9cde11cd36522c2d968dffa9505eb8
Remove os="cirros" attribute

As there is no Cirros specific edition of the guide, and it's unlikely
there ever will be one, this note will never actually be displayed. This
change removes the attribute and rephrases the text of the node slightly.

Change-Id: I21ea1244e9e95ac7de25417a391a4909397a61aa
backport: havana
Remove hanging ';' in some os attributes

Some os attributes (2) have a "hanging" semi-colon, probably where
another os value has previously been removed but not the associated
divider.

I've removed these as a prelude to an additional check I wish
to add to tools/test.py to pick up unknown os values.

Change-Id: I469ea81f5a48f762cd0f6f2e92d457416360976e
backport: havana
Merge "Fix outstanding conflicting os profiling."
Merge "Update headings plus edits for consistency and clarity in End and Admin User Guides"
Merge "Remove os="cirros" attribute"
Merge "test.py: Improve output"