Merge "Sync latest strutils from oslo-incubator for mask_password fix" into stable/icehouse