Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev