Bring our maint branch for r15 up to the latest patches for Riak 1.4.x

Looks like this branch didn't get the scheduler patch, though the main motivation for this was to get the POODLE fix in.