JBTIS-264 - rebased to get xcoulons changes

No errors from rvm.