Make bootstrap process more smooth
Make bootstrap process more smooth

Change-Id: I83f5d48394e7405ba281e4839a688ad4a59368df

enovance/software-factory,invenfantasy/software-factory,enovance/software-factory,enovance/software-factory,invenfantasy/software-factory,enovance/software-factory,invenfantasy/software-factory,invenfantasy/software-factory,invenfantasy/software-factory,enovance/software-factory