Added source and target container validation + fix osgi test
Merge with master