Merge pull request #60 from davecramer/REL9_2_STABLE

backpatch BaseDataSource
incremented version to fix pushing a 1.7 build for maven