fixes for 1396 None values in device object lists.
Merge pull request #1599 from edwardhunter/1396_rebase

fixes for OOIION-1396 None values in device object lists.