upstream patch release 0.15.2 and patch to make tests run properly
fixup dumb merge issues
Add try/except to not fail on missing info

Fixes #5334
Merge pull request #5354 from herlo/master

upstream patch release 0.15.2
fix NoneType error

Check to make sure user and domain aren't None
Merge pull request #5353 from UtahDave/fix_5334

Add try/except to not fail on missing info
Merge pull request #5355 from UtahDave/fix_win_status

fix NoneType error
bump windows installer version number.

0.15.3
Merge pull request #5356 from UtahDave/develop

bump windows installer version number.