Rename props.has_propkey back to props.has_key

This was renamed in 03e1d28, but that was too much.  Pep8 was only
complaining about calls to has_key when 'in' is better.