Update
dont fail with 500 if configured display name attribute is not set
Fix infinite loop if count and limit is 0

* otherwise it will always think it hits the limit and need another round to fetch additional results
Merge branch 'stable7-upstream' into stable7-rotdrop