Merge branch 'fix/single-bootstrap-control-paths' into 'develop'

Align control-path bootstrap with TF-SDK for Release 2.0.0

See merge request !43