Squashed commit of the following:

commit a9463bd1931c66219bd1925726c6c684defd4f60
Merge: dfbcf31 4590813
Author: ynojima <mail@ynojima.net>
Date:   Tue Oct 1 16:24:27 2013 -0600

    Merge branch 'master' into vxlan-doc

    Conflicts:
    	client/WEB-INF/classes/resources/messages_ja.properties
    	client/WEB-INF/classes/resources/messages_zh_CN.properties
    	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
    	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
    	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
    	plugins/network-elements/vxlan/pom.xml
    	plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java
    	plugins/network-elements/vxlan/test/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java
    	scripts/vm/network/vnet/modifyvxlan.sh
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	ui/scripts/sharedFunctions.js

commit dfbcf31bf40d2ad3120314a07226d347e664f30e
Author: ynojima <mail@ynojima.net>
Date:   Wed Sep 18 11:30:40 2013 -0600

    correct grammar mistakes

commit 53b711da8abcef011c9bcaf764471363d848e0f4
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Sat Aug 3 00:13:48 2013 +0000

    8/2 kaeru...

commit 59f41acc7dae2569b7ad639e9c36a9aca6022278
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Fri Aug 2 17:55:55 2013 +0000

    before lunch 2

commit 7f5086eaa73d3436ad7f297f2c43eab28621e5d7
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Fri Aug 2 17:42:46 2013 +0000

    before lunch

commit f3f9ce43bd99ea185f55befced6612ee023e7df8
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Thu Aug 1 20:48:28 2013 +0000

    0801

commit b2a0acf580dd2ca84707b533d31920bab211654a
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Thu Aug 1 01:25:54 2013 +0000

    add how to build kernel and iproute2

commit 7ea75db446308b7f220bf4b9e3cbf9377d46ca7a
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jul 24 19:57:06 2013 -0600

    Initial commit for vxlan doc

commit aed43519133b413bf52c3dcc6fe7722c505614ec
Merge: 450c3c5 29b6582
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 23 05:25:51 2013 +0000

    Merge branch 'vxlan-squash' into vxlan

commit 29b65822a2620ff61c6e2300c6dbdffb833dc131
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 23 05:24:41 2013 +0000

    to be merged

commit 450c3c5e1bb51aae918cf391ee85c92754edb3e2
Merge: 18b6c1a a844e8b
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 23 05:03:36 2013 +0000

    Merge branch 'vxlan-squash' into vxlan

commit a844e8b096aafb9515be6dbbbb141dd304fa2449
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 23 05:03:20 2013 +0000

    to be merged

commit de256d2c92c972aa0cea3c8dc07d922d5fbed405
Merge: 9d422b8 51377c4
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 23 04:55:17 2013 +0000

    Merge remote branch 'upstream/master' into vxlan-squash

commit 9d422b8e374a1389e7d45dd758f7200f2ed31ee5
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Mon Jul 22 19:31:18 2013 -0600

    Reflect type change of VirtualMachineProfile

commit 18b6c1a491d593b3dcfacf12ed4bf7803003f74e
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Mon Jul 22 19:31:18 2013 -0600

    Reflect type change of VirtualMachineProfile

commit ae52246245461d93e8fa76ce3f7869df7e00e99e
Merge: 434c72f a72b811
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Mon Jul 22 17:19:18 2013 -0600

    Merge branch 'vxlan' into vxlan-ui

    Conflicts:
    	ui/scripts/network.js
    	ui/scripts/sharedFunctions.js
    	ui/scripts/system.js

commit a72b81123641a476fef20c9972b3bd69224a60c4
Merge: 86c05d3 04cdd90
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Mon Jul 22 16:38:16 2013 -0600

    Merge remote-tracking branch 'upstream/master' into vxlan

    Conflicts:
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	ui/scripts/ui-custom/zoneWizard.js

commit 434c72f00c6bd55d7a1e3ceeea0d86eed0119ef5
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Mon Jul 22 15:46:38 2013 -0600

    Add case handling for broadcastUri is not vlan/vxlan

commit 384831ebabc1d9ded2e5f16f079464b1726bb8a0
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Thu Jul 18 15:37:13 2013 -0600

    Finger cross

commit 86c05d30412025919464e899223965a904abe64a
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jul 17 17:15:38 2013 -0600

    Revised

commit eb2fe707bab17783400214406c429e3278a66ba0
Merge: ebb414d bf32776
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 20:22:23 2013 -0600

    Merge remote-tracking branch 'upstream/master' into vxlan

commit ebb414d6c65a358b6fbd7c06cd5aa6b1826d5bf8
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 20:03:04 2013 -0600

    Squash duplicate test case.

commit cedbe124e9c941d3051739daf84d3f8b8f44ce79
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 19:38:08 2013 -0600

    Create static method wrapper for test.

commit 6ce990f4c9896b78dfa13391d7fa96267a4df3db
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 18:34:32 2013 -0600

    Fix misused matcher

commit 5e5884ee7607c5a8d9b3c1505178ef2720a3b06a
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 18:22:36 2013 -0600

    Moving forward...

commit 1efa943fd178b1a6d9e112f8fee95c0a7be0f38e
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 18:10:49 2013 -0600

    I hope this fix

commit e881351acf2c030d53df3293b0c280818c509941
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 17:52:09 2013 -0600

    Vxlan Guru doesn't support VNI specified, for now.

commit e3ec8a53b9418c42016fe3026d2e938a99424efe
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 16:52:42 2013 -0600

    Remove garbage

commit 217a2d48fd578c99093548e38005d6a334aebf0b
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 16:17:56 2013 -0600

    Modify test condition to match Vxlan case

commit 73855b4ffeeae178395ce150a94c29a2ef482d3e
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 16:04:29 2013 -0600

    Remove unused imports from VxlanGuestNetworkGuruTest

commit 1758b4244910420cd2df9ede41c24aaabf68a1a0
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 16:00:13 2013 -0600

    Fix bug: shutdown doesn't handle broadcast domain type properly

commit 13fc9b9b8b2c3026d6e6d6c338375350a2b82236
Merge: 098ec52 af921c4
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 15:36:50 2013 -0600

    Merge remote-tracking branch 'upstream/master' into vxlan

commit 098ec5264bd2519fef452be812aecfc102817e33
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 16 15:29:31 2013 -0600

    Add test, improve comment

commit b25999b47841ce5af27c75f2da6b88e012e53a66
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Mon Jul 15 16:25:38 2013 -0600

    Improve error message when vxlan kernel module not found

commit e4c57fabf960cbe4551e0ed2750961d16aa3bb0d
Merge: bb60e9d ecdb700
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Mon Jul 15 10:41:17 2013 -0600

    Merge remote-tracking branch 'upstream/master' into vxlan-master

    Conflicts:
    	client/tomcatconf/componentContext.xml.in
    	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
    	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
    	server/src/com/cloud/network/NetworkServiceImpl.java

commit bb60e9d7a4e8e2b3ebf42d301e6e5316144972d9
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Mon Jul 8 20:01:17 2013 -0600

    Add some error handling and error message improvement.

commit ef4b3132f996b96f2d15dd4551fcbbe911bda42b
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Fri Jul 5 20:25:10 2013 -0600

    cleanupVnet doens't call modifyvlan.sh correctly.
    I'm giving up to cleanup it in cleanupVnet, but handle in unplug.

commit d210e0a295bc6cee427375253a27a93102107ac7
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Fri Jul 5 19:18:15 2013 -0600

    fix logic error in checking if bridge is still in use or not.

commit 74fd37c0ba4e5414de1f1726fb4cebbaaa3f8b33
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Fri Jul 5 18:40:13 2013 -0600

    Change unplung matching a bit.

commit e8c0008ac112f5c70f13aaf21af21ed65056d977
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Fri Jul 5 17:08:08 2013 -0600

    fix wrong check condition on unplug

commit bd39b26fc424b5772693d3a17a137068113f30aa
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jul 3 17:39:41 2013 -0600

    Delete bridge while unplug().

commit 7a70e0a40e06f3b824e8c1dd2719d3ba7ee6e48e
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Wed Jul 3 00:12:33 2013 +0000

    newline code

commit 41ed61efc8c8c7d35a79a41b52ef87243c3597fe
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 2 18:12:44 2013 -0600

    Stash

commit 6f91986b0386a5bfbb32c51eed80b255bb5f013d
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 2 17:11:39 2013 -0600

    Switch script by tunneling protocol [VLAN/VXLAN]

commit 72406e910e891732e0809daf76f1ccb50c3ca09b
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 2 16:12:52 2013 -0600

    Added BroadcastType.vxlan handling

commit 9d1100cb2250a73b03c727dcf34f24a72271bacc
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 2 16:12:24 2013 -0600

    Add Comments

commit b74ff943cec36a8142931ed551ec8baa170418bb
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Tue Jul 2 16:02:54 2013 -0600

    Add License

commit 6d586862ac465a6662440627806ec60b7d94a891
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Fri Jun 28 15:41:16 2013 -0600

    Channge comment, on specify VLAN id

commit 273126dfa5489485b3703bed45bfd1b8d1bd3f71
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Fri Jun 28 14:27:35 2013 -0600

    Change broadcast domain type to VXLAN.

commit c3183c241c0ce2e04813c5cc91e82ecd21362857
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Thu Jun 27 15:13:53 2013 -0600

    add VXLAN

commit 7c156735eb1ef40bebfe224e51f26ef41d465dd6
Merge: 9760411 cf4dba3
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Thu Jun 27 13:31:21 2013 -0600

    Merge remote-tracking branch 'upstream/master' into vxlan-master

commit 97604119a7392cce2458ec036e8b5b24eb4c9d62
Merge: bf71c0e de44a77
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jun 26 19:30:34 2013 -0600

    Merge remote-tracking branch 'upstream/master' into vxlan-master

commit bf71c0e30579d5a8b847d43f5f9705bf98e757a7
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jun 26 18:01:00 2013 -0600

    add VXLAN broadcastURI

commit 9cfc48deb4b869ede968fd091056263e7fd48094
Merge: 1f0866a 7e96bf5
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jun 26 15:38:45 2013 -0600

    Merge remote-tracking branch 'upstream/master' into vxlan-master-th

    Conflicts:
    	api/src/com/cloud/network/PhysicalNetwork.java
    	client/tomcatconf/componentContext.xml.in
    	ui/scripts/ui-custom/zoneWizard.js

commit 1f0866a225b7fff85e076a740cb261ace6927700
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jun 26 15:30:30 2013 -0600

    Mark vlan assuming code

commit d2942934d2c6e903a82f3a930f311b765b296e53
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jun 26 15:28:13 2013 -0600

    Remove unused imports.

commit 2fb60bd1f17611075165c471771be5c9d5d9a76a
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Wed Jun 26 15:23:55 2013 -0600

    add VXLAN Guru in componentContext.xml (commented out)

commit 17abb8196b8a492cf5908a4cfe047b14be64a395
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Thu Jun 20 18:08:24 2013 -0600

    fix build path issue

commit 77a0b86d78d35c6ace6aad3fa05523b7c9b9ece8
Author: toshiaki.hatano <toshiaki.hatano@verio.net>
Date:   Thu Jun 20 18:00:12 2013 -0600

    add vxlan plugin into build path, component file (commented out, for
    now)

commit eb00579240fd35494a165373d20ccc55005b401e
Author: Toshiaki Hatano <toshiaki.hatano@verio.net>
Date:   Thu Jun 20 22:47:08 2013 +0000

    init