MB-9343 sligth ebucketmigrator_srv re-factoring

Change-Id: I353cee570e103d60f8a6a499da582cd3489e8655