More prepopulated systems in bootstrap

Change-Id: Idca17f9f2a8ab859eb99b81bc8d09fb7eeda7a3f
Signed-off-by: Fredrik Luthander <frazor@gmail.com>