Merge ryu2janus into latest silver (plus extra commits from savi-1.1)

With new Janus drivers for Quantum, now the same Ryu branch can be used regardless of whether Janus is running or not