baseURL SHALL NOT contain servletPath !

Change-Id: I22d76d7a0dcbafead8df0b19f32d10bf3c27e40a