Move xml/xslt deps to account for nokogiri change
Merge branch 'deb/nightly' into deb/stable