tests: fix for manually reserve system metrics

Need to also close off any open manual reservations from earlier in the
test suite.

Change-Id: Ib6cb1cd074c5a900ab54205278289b3074e31b07
Merge "tests: fix for manually reserve system metrics" into develop