Removed progress that represent state transition, rather than state
Converged AgentState.PLANNED and AgentStage.MACHINE_TERMINATED
Removed MACHINE_MARKED_FOR_TERMINATION state
Changed numberOfRestarts to numberOfStarts - zero means not started even once
Merge branch 'develop' into agent-statemachine

Conflicts:
	orchestrator/src/test/java/org/cloudifysource/cosmo/ServiceGridOrchestrationTest.java
Merge branch 'develop' into agent-statemachine

Conflicts:
	orchestrator/src/main/java/org/cloudifysource/cosmo/service/ServiceGridOrchestrator.java
Fixed indentation