Switch to new service manager implementation.
Signed-off-by: Dmitriy Pavlenko <dmitriy.pavlenko@sysgears.com>
Merge remote-tracking branch 'origin/master'