Enhanced content bundle support

for http://wiki.sugarlabs.org/go/Features/Content_support