OCT-6017 #comment fix for proper handling of ruby 2.2