[python-django-horizon/el6: 11/11] Merge branch 'f17' into el6