Final versioning for 2012.2.4

Change-Id: Ic9ee9a7336c8f5f64ad4700c0322653e331c10bb
Bump version to 2012.2.5

Change-Id: Ibf237525fc86d5ba2129620f58d574685a713782
Merge remote-tracking branch 'upstream/stable/folsom' into folsom