[CLC-1531] Celluloid and nokogiri updates
Merge pull request #1163 from yuhunglin/CLC-1531

[CLC-1531] Celluloid and Nokogiri updates