interim commit fixes for various aspects of collection support

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@palm.com>