Merge "Fix variable attach_encrypted_volume if barbican is absent"