Minor fixes
Merge pull request #658 from sbesson/rebased/dev_5_0/rebased/develop/grid_templates

Improve server-template description in advanced configuration (rebased onto develop) (rebased onto dev_5_0)