Be more selective about what ends up in our sourcedicts

 - no flattened resource_metadata
 - strip out flavor ID