Fix content.ftl in imos workspace

Conflicts:
	workspaces/imos/content.ftl
Correctly name config.ftl
Remove auv_trajectory_data_st which still references schema imos.mod:auv_trajectory_data_st
Merge branch 'master' into production

Conflicts:
	gwc-layers/LayerInfoImpl-66a72209_1430e66bb4d_-7fee.xml
	workspaces/imos/config.ftl