Fix merge problem and bug.

Merge problem made the "NCLProvisioner - update" method not to work properly. This patch fixes the compilation problem.