Merge "Add the choice of interface for keystoneclient"