Merge pull request #7103 from s0undt3ch/0.16

Fix the salt CLI tools version check test case
bump version to 0.16.4
Rough html and xml coverage option changes to reuse the same state tree.