
This reverts commit feec91cec10ff080f124cfbb8ff7274bfb25ba8b. Turns out this wasn't okay, sub_ports property on Trunk objects is a list of dictionaries. This also fixes unit tests to account for that. Change-Id: I17f217a6f2bfc833019ba407c248564e74b663d2