Fix merge problem and bug.
Fix bugs in NCLProvisioner-update method. Notification should include flowid, and also it should notified when the given circuit does not exists.
Merge pull request #977 from adrian-rosello/fix/merge-problem

Fix merge problem and bug.