Refactor the ObjectContainer to use correct generics and singleton pattern.
Defect: VIS-51
Authored by: namhm 2013-12-22
Parent: [r98]
Child: [r100]