Cherry-pick version number change from EE-1.2 branch