Fix "build_command_line" exception.

Fixes ZEN-9348.
Merge pull request #107 from zenoss/feature/ZEN-9348

Please review branch feature/ZEN-9348