Creating template
Merge remote-tracking branch 'openshift/master'
Changed from stupid connection_dict to connection_string and selecting database