Merge "javelin: implement floating-ip support"