Merge remote-tracking branch 'origin/SFX-2' into SFX-2-stable
Update version number for this release.
Merge branch 'SFX-2-stable' into SFX-2
Setup snapshot versions for the next release.