Backport of 2.1.5 features on 1.3.2 ConnId framework
Merge pull request #1 from dsigno/db-2_1_4_X

Well done! - Backport of 2.1.5 features on 1.3.2 ConnId framework