Change openflowswitch monitoring capability type to ofmonitoring.

There was already one capability with that type (in ROADM), which was causing confusions.
Update openflowswitch sample descriptor.
Support null switch statistics from floodlight.
Merge pull request #927 from isartcanyameres/fix/floodlight-driver-get-null-statistics

Support null switch statistics from floodlight.
Merge pull request #926 from isartcanyameres/fix/duplicated-monitoring-capability

Change openflowswitch monitoring capability type to ofmonitoring.
PathFinder takes into account congestion detected by NCLMonitoring.
Thread save and better logging for NCLProvisionerCapability

Conflicts:

	extensions/bundles/genericnetwork/src/main/java/org/opennaas/extensions/genericnetwork/capability/nclprovisioner/NCLProvisionerCapability.java

Conflicts solved manually.
Improve logging for NCLMonitoring not finding netstatistics.
Fix replace method: deallocate before allocate.

When same ids are given it was not behaving correctly. It was deleting newly created circuits.
Try to reallocate only reallocable circuits.

Conflicts:

	extensions/bundles/genericnetwork/src/main/java/org/opennaas/extensions/genericnetwork/capability/nclprovisioner/NCLProvisionerCapability.java
Conflicts solved manually.
Merge pull request #928 from isartcanyameres/fix/nclpathfinder-avoids-congested-routes

PathFinder takes into account congestion detected by NCLMonitoring.
Merge pull request #929 from isartcanyameres/fix/threadsafe-nclprovisioning-capability

Concurrent protection using lock in setter methods (allocate/deallocate/reroute).

This patch also improves logging for NCLProvisioningCapability and for NCLMonitoring.
Merge pull request #930 from isartcanyameres/fix/replace-circuit-bug

When same ids are given it was not behaving correctly. It was deleting newly created circuits.
Merge branch 'develop' into fix/improve-rerouting-strategy

Conflicts:
	extensions/bundles/genericnetwork/src/main/java/org/opennaas/extensions/genericnetwork/capability/nclprovisioner/NCLProvisionerCapability.java

Conflicts solved manually.
Log cause for not finding alternative route.
Merge pull request #931 from isartcanyameres/fix/improve-rerouting-strategy

This patch solves a bug:

With previous circuit selection strategy (select always the first circuit using given port) it may happen that the first one had no alternative route, and thus, fails to be re-routed in next steps. In that case, the circuit without alternative keeps being the first in the list and keeps being selected each time the re-route mechanism is triggered, although is not re-routed. This causes no harm if that circuit is the only one, but when other circuits are available, it may be the case that re-routing these others solves congestion. However, the strategy will never try these others :(
This patch solves this issue by picking up a circuit that is known to have an alternative route.
This way, each time the re-routing mechanism is triggered, a circuit is re-routed (if any available).
Add wrapper of FloodlightOFFlow to OFForwarding API.
Merge pull request #933 from adrian-rosello/fix/wrapper-for-switch

Add wrapper of FloodlightOFFlow to OFForwarding API.
Merge branch 'develop' into demo/ofertie-tnc-2014-merge

Conflicts:
	extensions/bundles/genericnetwork/src/main/java/org/opennaas/extensions/genericnetwork/capability/nclprovisioner/NCLProvisionerCapability.java

Conflicts solved manually.
Ignore configurable vlan in match in non OSGi environments