Fixed qafedatasource so it can build with jdk7 and datasource 1.6
Merge branch 'QAFE-1082-2' into develop