Ref #4392: Typo: categoy -> category
Fixes #4392: Allow to delete techniques category
Merge pull request #432 from fanf/bug_4392/Can_not_delete_active_techniques_category

Bug 4392/can not delete active techniques category
Fixes #4393: correct the default disclamer message
Merge pull request #437 from ncharles/bug_4393/dev/correct_message_header

Fixes #4393: correct the default disclamer message
Merge branch 'branches/rudder/2.6' into branches/rudder/2.8
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9