Revert "remove usage of deprecated APIs in tests"

This reverts commit 9b590210c288d206a45b08a3921af544241575a1.
Revert "class moved to g-d-m"

This reverts commit f203033c7096c2999d3975cf8cca2a5e77a22557.
Revert "update versions for release"

This reverts commit f303a58339783506a91b3f812b3d87628b778af5.
Revert "Revert "class moved to g-d-m""

This reverts commit 1d4c439a3050dd3857a951a731bb83d9b0b20d44.
use 3.0.6 release of datastore jars