Merge "Add insecure option to heat's heat client"