Revert 3

Lucky number 13 -- not only are shark-0.8.0-candidate-csd-6-SNAPSHOT and corresponding versions of data-layer, sparky and stormy all happy with hive-csd-13, so are the master-csd branch of shark (change only hive-csd-9 to hive-csd-13 in the pom and it will build successfully and run the hive and shark unit tests without regressions) and the master branch of sparky with only a small change (see pull request.)