Cleanup and add documentation for tags

* Fixed one scenario to work with the default setting
* Fixed one typo in scenario
* Removed unused tags
* Documented the tags currently in use

Change-Id: I14687782857daf79dcd497b934dff99fc45a3997
Merge "Cleanup and add documentation for tags"