Re-added patch.  Hopefully d.o works by the time we rebuild #3258

Here's the #3258 password policy patch for making consecutive character counts work.  Kept separate from the rest because d.o's new issue queue isn't letting us get patches reliably.