Merge "Make CLI tests python2.6 compatible"