Fix redis conf file path

On Ubuntu 12.04 the redis configuration file path is '/etc/redis/redis.conf' and not '/etc/redis.conf'
Merge branch 'master' of https://github.com/Doude/devstack

Conflicts:
	lib/neutron_thirdparty/contrail