Respect unittags when searching for repository servers
Merge branch 'wv1/8757_3853' into 2.7-lhm
Fix PHP error for repository servers without a unittag