CA-142595: Merged into xs64bit

Signed-off-by: Mate Lakat <mate.lakat@citrix.com>

GitHub: closes #216 on xapi-project/sm