Issues/130 jdbc template cherrypick

This is done by cherry-pick.