fix ostf setup and manifest.in
Merge pull request #112 from Mirantis/fix/setup

fix ostf setup and manifest.in
Merge remote-tracking branch 'upstream/master'
Resolved pull comments