Re-apply #936 fix (merge issue?)
Re-apply #936 fix (merge issue?)

AJ-72/testng,gjuillot/testng,missedone/testng,AJ-72/testng,cbeust/testng,akozlova/testng,gjuillot/testng,emopers/testng,gjuillot/testng,akozlova/testng,akozlova/testng,akozlova/testng,AJ-72/testng,emopers/testng,akozlova/testng,emopers/testng,cbeust/testng,krmahadevan/testng,missedone/testng,gjuillot/testng,AJ-72/testng,missedone/testng,missedone/testng,gjuillot/testng,missedone/testng,cbeust/testng,AJ-72/testng,emopers/testng,AJ-72/testng,krmahadevan/testng,emopers/testng,krmahadevan/testng,krmahadevan/testng,krmahadevan/testng,cbeust/testng,cbeust/testng