Merge "Remove default value for Cinder Auth Strategy"