Issue #1172: Add the --descriptor option
Exchange some tabs for spaces.
Improve the import-jar test and add tests for #1172
Fix #1172