Merge branch 'task/JAL-1794_jettyExamplesServer' into develop