Removing the merge conflict statements from git.
IPv6: Accept IPv6 parameter for createNetworkCmd

Also ass public_ipv6_address for ipv6 address management.

Extend nics and vlans for ipv6 address.

Add dependency to com.googlecode.ipv6(java-ipv6).

Modify dhcpcommand for ipv6.

Conflicts:

	api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
	pom.xml
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/dc/VlanVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkVO.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkModelImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
IPv6: Enable IPv6 address for router
IPv6: Update edithosts.sh accept parameters
IPv6: Update dnsmasq.conf to new version
IPv6: Enable VR's ability to provide DHCPv6 service
IPv6: Disable password and userdata service for ipv6 for now

Would add support later.
IPv6: Fix getIp6FromRange()
IPv6: Make the IPv6 input all lowercase

To make them consistent.

Conflicts:

	api/src/com/cloud/api/commands/DeployVMCmd.java
IPv6: Fix generated DUID-LL

Should be: 00:03:00:01 + <Mac>
IPv6: Add IPv6 address to router in /etc/hosts
IPv6: Remove dualstack parameter from createNetworkCmd

We can tell if it's dual stack by looking into the startIp and startIpv6.
IPv6: Fix missed AddressFormat in nic table
IPv6: Fix VlanIpRangeResponse

Conflicts:

	api/src/com/cloud/api/response/VlanIpRangeResponse.java
IPv6: Update NetworkResponse and NicResponse

Conflicts:

	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/api/response/NicResponse.java
IPv6: Add nic response to user vm
libvirt has bug to report storage stastics
IPv6: Fix generate random ip in range.

Ported from ipv6 branch.
IPv6: Add details for domainrouter response