[#5703] Refactored task decorator's handling of class tasks

Signed-off-by: Cory Johns <johnsca@geek.net>
[#5703] Removed clean_all option missed during merge conflict resolution

Signed-off-by: Cory Johns <johnsca@geek.net>