Merge "Fix for nova aggregate mappings"