FLUID-5449: Updating the version # to 2.0-SNAPSHOT

http://issues.fluidproject.org/browse/FLUID-5449

also addresses http://issues.fluidproject.org/browse/FLUID-5290