GADGETS-72 Change to consistent datasource name
fix for BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1021313
Merge pull request #21 from EricWittmann/master

fix for BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1021313
fix for: https://issues.jboss.org/browse/SRAMP-257
Merge pull request #22 from EricWittmann/master

fix for: https://issues.jboss.org/browse/SRAMP-257
Fix for BZ 1030047
Merge pull request #23 from EricWittmann/bz-1030047

Fix for BZ 1030047
RTGOV-316 Update integration bom/parent to 6.0.0.CR3
Increased the http timeouts for shindig rest calls.
Merge pull request #24 from EricWittmann/bz-1031413

Increased the http timeouts for shindig rest calls.
fixed a couple class references due to dependency refactoring
Merge pull request #25 from EricWittmann/refactoring-1

fixed a couple class references due to dependency refactoring
Fix for column name clash in ORACLE db