CLOUDSTACK-6687: Fixed IP reservation test case failures with code re-factoring