CMS: updates to `cms-tools-ana.xml`

* Fixes software consistency.  (addresses #120)
  (addresses #112) (addresses #131) (PR #136)

Reviewed-by: Tibor Simko <tibor.simko@cern.ch>