removed apis from repox and sugar external services;
merge
Merge origin/v3.0-development into v3.0-development

Conflicts:
	pom.xml