HPCC-10412 Fix problems with #elseif and catch multiple #else

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>