Merged with develop
HIVE-7936 - fixed test o/p