Starting with Django 1.9 SortedDict has been removed completely, and this is currently blocking the gate. This patch replaces SortedDict with the python native OrderedDict. Closes-Bug: #1696072 Change-Id: I2206fe5807e578b80cc5bf5c38d2556c2adad0b9