Fix Savanna enpoints and service type

Fixes bug #1262226

Change-Id: I13be2f478fa030468336284fb8730a2f787addb2