Remove gemini_enabled and memento_enabled options - always enable them
Take new gemini and memento
Merge remote-tracking branch 'origin/dev' into memento-iss21
Merge pull request #856 from Metaswitch/memento-iss21

[Reviewer: Alex] Remove gemini_enabled and memento_enabled options - always enable them