Upgrading redis to 2.6.14 - with separate commits for easier community PR slicing