[master] Merge branch 'trac2702' (DHCPv4 renewal without client-id)

Conflicts:
	ChangeLog

diff --cc ChangeLog
index b835d41ea329344e767865bd29505794841e97ce,2bbdaff83a1417f65da71cc36d4cbd87b0b5b4a2..4c0dcdacd386ebe1c0f365491a5b061401fa2339
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 -5XX.  [bug]           marcin,tomek,tmark
++570.  [bug]           tmark, marcin, tomek
+       b10-dhcp4: Address renewal now works properly for DHCPv4 clients
+       that do not send client ID.
+       (Trac #2702, git daf2abe68ce9c111334a15c14e440730f3a085e2)
+ 
 +569.  [bug]           tomek
 +      b10-dhcp4: Fix bug whereby a DHCP packet without a client ID
 +      could crash the MySQL lease database backend.
 +      (Trac #2697, git b5e2be95d21ed750ad7cf5e15de2058aa8bc45f4)
 +
  568.  [func]          muks
        Various message IDs have been renamed to remove the word 'ERROR'
        from them when they are not logged at ERROR severity level.