Fix merge problem and bug.

Merge problem made the "NCLProvisioner - update" method not to work properly. This patch fixes the compilation problem.
I don't think so, I fixed it in following commit :)