Fix for DE231 - changed hard-coded osops_network to use a parameter
Merge pull request #53 from odyssey4me/DE231

Merged automatically by jenkins after successful build test
Allow the Cert/Key location to be overridden to a custom location
Merge pull request #55 from andymcc/custom_cert

Merged automatically by jenkins after successful build test
update quantum quota driver to DBQuotaDriver.  This allows us to alter quotas with quantumclient
Merge pull request #56 from mancdaz/grizzly

Merged automatically by jenkins after successful build test
Adjust network definitions so network settings can be adjusted
Merge pull request #58 from andymcc/network_change

Merged automatically by jenkins after successful build test
Allow VLANs to be specified for nova-network
Merge pull request #59 from andymcc/nn_vlan

Merged automatically by jenkins after successful build test