Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack

Re-re-merge for network-refactor merge

patches/systemvm/debian/config/etc/init.d/cloud-early-config

@@ -660,7 +660,7 @@ EOF
   enable_svc dnsmasq 1
   enable_svc haproxy 1
   enable_svc cloud 0
-  disable_rpfilter_domR
+  disable_rpfilter
   enable_fwding 1
   cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules
   setup_sshd $ETH0_IP "eth0"

patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh

@@ -134,6 +134,7 @@ create_guest_network() {
   sudo ip addr add dev $dev $ip/$mask brd +
   sudo ip link set $dev up
   sudo arping -c 3 -I $dev -A -U -s $ip $ip
+  echo 1 > /proc/sys/net/ipv4/conf/$dev/rp_filter
   # restore mark from  connection mark
   local tableName="Table_$dev"
   sudo ip route add $subnet/$mask dev $dev table $tableName proto static