Merge branch 'proactive-dev' into 'morph-rc1.5'
change to check if IAAS nodes are already collected by SAL (BYON nodes are not... See merge request !26
change to check if IAAS nodes are already collected by SAL (BYON nodes are not... See merge request !26