Merge remote-tracking branch 'origin/bool-prefix' into rollup

Author: mr-c

cwltool/builder.py

@@ -230,7 +230,7 @@ def generate_arg(self, binding):  # type: (Dict[Text,Any]) -> List[Text]
             return [prefix] if prefix else []
         elif value is True and prefix:
             return [prefix]
-        elif value is False or value is None:
+        elif value is False or value is None or (value is True and not prefix):
             return []
         else:
             l = [value]