Fix issue with metadata not working in SYSTEM mode
EUCA-6442
Fix content organization
Merge branch 'dev/chuck/EUCA-6443' into testing