Fix AOF bug: expire could be removed from key on AOF rewrite.

There was a race condition in the AOF rewrite code that, with bad enough
timing, could cause a volatile key just about to expire to be turned
into a non-volatile key. The bug was never reported to cause actualy
issues, but was found analytically by an user in the Redis mailing list:

https://groups.google.com/forum/?fromgroups=#!topic/redis-db/Kvh2FAGK4Uk

This commit fixes issue #1079.
Reset masterauth if an empty string is configured.
CONFIG SET server.masterauth aesthetic change.

This is just to make the code exactly like the above instance used for
requirepass. No actual change nor the original code violated the Redis
coding style.
Merge remote-tracking branch 'antirez/2.6' into 2.6