holmium more corrections, service not rule for ferm definitions

this has been a learning experience with far too many patchsets

Change-Id: I980da61cef43acc205dabc58da2cdf9dcd3fdffc