NXP-12745 reported content disposition changes in tests
NXP-12625: Add Computer Group with Label management
cleanup