Fix to properties file ordering now that there's no dedicated prod
version anymore.
Merge branch 'v1' into v2
Merge branch 'v2' into v3