Consistent use of identity comparison (`is`/`is not`) for None
Bugfix: Removing a line that shouldn't have been brought back in during merge
Merge remote-tracking branch 'upstream/develop' into consistent-identity-comparison-none

Conflicts:
	boto/manage/server.py
Merge pull request #1930 from oxtopus/consistent-identity-comparison-none

Consistent use of identity comparison (`is`/`is not`) for None. Fixes #1930.