CA-154651 Bump xapi version number to 2.4. (Also fix up merge error in last commit)
Merge pull request #33 from stephen-turner/master

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