Fixed lifecycle test.
Merge branch 'master' into osgi