Add basic bootstrap configuration
Clean and test bootstrap. Need server restart to work.
Merge branch 'bootstrap'