Merge branch 'hotfix/3513'

Close #3513
[Db] fixed use of two undefined classes/interfaces
[2.1] Fix variable Name and Resource on Oracle Driver Test
fix trailing spaces
Merge pull request #3524 from marc-mabe/hotfix/db_useOfUndefinedClasses

[2.1][Db] added two missing use statements
Update library/Zend/Di/Definition/CompilerDefinition.php

Remove commented code block
Merge branch 'patch-1' of git://github.com/prolic/zf2 into prolic-patch-1
Merge pull request #3531 from samsonasik/dev.fixvarname

[2.1] Fix variable Name and Resource on Oracle Driver Test