:qMerge branch 'servers' of https://github.com/netsec-ethz/scion into servers
:qMerge branch 'servers' of https://github.com/netsec-ethz/scion into servers

dmpiergiacomo/scion,netsec-ethz/scion,Oncilla/scion,klausman/scion,Oncilla/scion,Oncilla/scion,FR4NK-W/osourced-scion,netsec-ethz/scion,dmpiergiacomo/scion,FR4NK-W/osourced-scion,klausman/scion,FR4NK-W/osourced-scion,klausman/scion,dmpiergiacomo/scion,Oncilla/scion,FR4NK-W/osourced-scion,dmpiergiacomo/scion,netsec-ethz/scion,klausman/scion,FR4NK-W/osourced-scion,dmpiergiacomo/scion,netsec-ethz/scion,klausman/scion,dmpiergiacomo/scion