Issue IKTREDEL-61 by cableman: Changed auth to use the new api keys plugin
Issue IKTREDEL-61 by cableman: Added API keys plugin to api plugin
Resovled merge conflict