Fix merge problem and bug.

Merge problem made the "NCLProvisioner - update" method not to work properly. This patch fixes the compilation problem.
In case getFlow(flowId) throws FlowNotFoundException, sdnClient.qosPolicyAllocationFailed will NOT be invoked.
But was invoked in previous code.

Is this change on purpose?