Prepare Flow for schema change in 1.23wmf13

Change-Id: I5b9f58a94adcd3ec9b1e68dfd4c2224cb863c10d
Merge "Prepare Flow for schema change in 1.23wmf13" into wmf/1.23wmf13