De-verpick phase 1
def_domain removed using classproperty
Un-verpick phase 2
Try to avoid all eager ssh calls
Merge pull request #1289 from mfalesni/verpick-swap

De-verpick phase 1