Fix for Bug NMS-6020 (Adding OnmsBeanContainer)

PLEASE DO NOT ATTEMPT TO MERGE THIS WITH MASTER.