Change <osgi> to <container> in library project.xml
Some minor refactoring to have code model track name change.

[Review issue 7392001]