annotations: fix for broken bundles

* Addresses issue with invalid bundle names in templates.
  (closes #2327)

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>