Second version of connection_parameters patch.

This one should take into account all the comments on the previous one. In particular, I renamed the new option to the lower case.