Merge pull request #32 from stephen-turner/master

Merge xs64bit into master
CA-154651 Bump xapi version number to 2.4. (Also fix up merge error in last commit)