Also cleans some white spaces
- adding the options builder to fill in the model - adding the spec into the bootstrap config
User reports of kubelet flags not being passed; moved more to code. Also found & fixed the likely root-cause issue: we have two copies of the cluster spec and were not being precise about which one we wanted to use at all times.