NSX manifests conflist with ML2 introduced changes

[Andrey Danin]

NSX installation fails because of wrong Neutron config.
Neutron config includes ML2 specific data, but plugin.ini file is for NSX.

VERSION:
  feature_groups:
    - mirantis
  production: "docker"
  release: "5.1"
  api: "1.0"
  build_number: "439"
  build_id: "2014-08-15_02-01-17"
  astute_sha: "b52910642d6de941444901b0f20e95ebbcb2b2e9"
  fuellib_sha: "d72cd84468ad9846d4768c11df039c43978a5028"
  ostf_sha: "d2a894d228c1f3c22595a77f04b1e00d09d8e463"
  nailgun_sha: "7d7e862ccbdbaa36785b95028d37ac91d7aca440"
  fuelmain_sha: "4f7f45d6a020cc5d49ff5c7ee249522a6de7a096"

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/114935

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/114945

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/114945
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=49165cf22be39de0236f88d3cec3220290d86449
Submitter: Jenkins
Branch: master

commit 49165cf22be39de0236f88d3cec3220290d86449
Author: Andrey Danin <email address hidden>
Date: Mon Aug 18 16:00:19 2014 +0400

    Fix Neutron core_plugin selection and NSX_OVS installation

    * Add if statement for NSX
    * Fix a string substitution in plugin_neutronnsx/manifests/alter_neutron_server.pp
    * Run plugin_neutronnsx::install_ovs in Stage 'netconfig' to avoid circular dependancies

    Change-Id: Iac46b79dae54a90b96ae8af7709a5d5676e7e95b
    Closes-bug: #1358255

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/114935
Committed: https://git.openstack.org/cgit/stackforge/fuel-web/commit/?id=1c529b18c6f130f9d14252d25ac26d8f7192642d
Submitter: Jenkins
Branch: master

commit 1c529b18c6f130f9d14252d25ac26d8f7192642d
Author: Andrey Danin <email address hidden>
Date: Mon Aug 18 15:00:53 2014 +0400

    Send quantum_settings:L2:provider as 'nsx'

    * Remove alternation of quantum_settings:server:core_plugin
    * Send quantum_settings:L2:provider = nsx instead
    * Fix Nailgun integration tests

    Change-Id: If581b39c0e82f07a0e1a0f8ee9db7da7a6151fe0
    Closes-bug: #1358255