WIP general: fixtures and template synchronization

* Brings improvements to *demosite* that are needed after #1899 is merged.

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>