[kmf-content-api] Avoid polling not receiving onTerminate event

Change-Id: I0b1b055ddcfcc477ce45c39c94a8787f120178a0
[kmf-system-test] Clean-up and ignored some tests

Change-Id: I85b3f1820a7c5e7a00dfa104117c725efee61b8e