Merge branch 'feature/KAA-1279' of github.com:Acarus/kaa into feature…

…/KAA-1279

Conflicts:
	server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/EndpointProfilesActivity.java
	server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/DataSource.java
	server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/data/EndpointProfileDataProvider.java
	server/node/src/main/java/org/kaaproject/kaa/server/admin/services/AbstractAdminService.java
	server/node/src/main/java/org/kaaproject/kaa/server/admin/shared/services/UserService.java

server/appenders/couchbase-appender/src/main/java/org/kaaproject/kaa/server/appenders/couchbase/appender/LogEventCouchbaseDao.java

@@ -16,12 +16,6 @@
 
 package org.kaaproject.kaa.server.appenders.couchbase.appender;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 import org.kaaproject.kaa.common.dto.logs.LogEventDto;
 import org.kaaproject.kaa.server.appenders.couchbase.config.gen.CouchbaseConfig;
 import org.kaaproject.kaa.server.common.log.shared.avro.gen.RecordHeader;
@@ -30,6 +24,12 @@
 import org.springframework.data.couchbase.core.CouchbaseTemplate;
 import org.springframework.data.couchbase.core.WriteResultChecking;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 public class LogEventCouchbaseDao implements LogEventDao {
 
     private static final Logger LOG = LoggerFactory.getLogger(LogEventCouchbaseDao.class);