ref #4028 - rework of edit-template directive
workaround for  defaultPollingTime-error which caused the application to crash  on startup
ref #4028 - message validation and code-documentation
ref #4028 - general fixes