CA-154651 Bump xapi version number to 2.4. (Also fix up merge error in l...

...ast commit)