Merge "Change glance default back to WSGI mode"