fix consolidation issue in SerconVirtualMachineConsolidation : 
*) if we succeed in releasing a LC, it is removed from the list
*) if not, we remove the its virtual machines from the MigrationPlan
(and leave the others)
fix typo in resource demand estimator...
Merge branch 'master' into testing