Moved common annotations used in DAO tests to base test class
Merge remote-tracking branch 'origin/master'