Issue #1216 with unit test
If no "configuration file" is set, the bootstrap should be taken from "--bootstrap" command line option
Merge pull request #1248 from Nikoms/issue1216

Fix #1216 with unit test