Demark behavioural differences between plans and stubs, move orphaned plans into dodal.

Demark behavioural differences between plans and stubs, move orphaned plans into dodal. #1723