Various ctf{convert,merge} fixes.
Merge branch '20141104-ctftools-misc-fixes' into markj-develop