This major patch implements wr-m-lock, wr-s-lock and wr-locked states,
while fixing bugs in wr-present and master state.