- Cleanup bootstrap, get rid of DIC for testing idea
- Cleanup bootstrap, get rid of DIC for testing idea

Change-Id: I5346b4e27f41aaa59f901b915f08bfcc99d654af

iwalz/zendserverapi,iwalz/zendserverapi,iwalz/zendserverapi,iwalz/zendserverapi