Fix syntax errors in ConfigurationManager and Resource Manager test
Conflicts:
server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
server/test/com/cloud/agent/manager/ResourceManagerTest.java
- Changes to schema file schema-2214to30.sql: moved out cleanup to separate file, added some NAAS changes
- Added physicalNetwork setup to Upgrade2214to30.java data migration
- Unit test and sample file