Fix the way that the container estimates when needs upgrading/downgrading.
Misc fixes and improvements for itests.
[FABRIC-395] Make sure that there is no clash with fabric-group.