
Also updates bin/marconi-self-host to use Bootstrap, not Kernel. Also fixes rebase issues Change-Id: Ie68f6f9765bb4763fba031a709483301f98fa72c Trello: #102
Also updates bin/marconi-self-host to use Bootstrap, not Kernel. Also fixes rebase issues Change-Id: Ie68f6f9765bb4763fba031a709483301f98fa72c Trello: #102