More changes for Bug 7845 - Productize DeploymentPlanner

- After applying the User concentrated Pod heuristic, order of clusters within a pod (based on capacity) should remain intact
- Only change should be clusters of which pod to be considered first

server/src/com/cloud/deploy/FirstFitPlanner.java

@@ -293,7 +293,11 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
 			if(podClusterMap.containsKey(pod)){
 				List<Long> clustersOfThisPod = (List<Long>)podClusterMap.get(pod);
 				if(clustersOfThisPod != null){
-					reorderedClusters.addAll(clustersOfThisPod);
+					for(Long clusterId : clusterIds){
+						if(clustersOfThisPod.contains(clusterId)){
+							reorderedClusters.add(clusterId);
+						}
+					}
 					clusterIds.removeAll(clustersOfThisPod);
 				}
 			}