Fix for DTACLOUD-421 JSON output against openstack

Makes sure we retain keyname when both authentication_password and
authentication_key are present in driver (openstack in this case)

https://issues.apache.org/jira/browse/DTACLOUD-421