Fixes for when no HSS is configured. In particular, don't send MAR to HSS when cache doesn't return an AV - we only queried the cache because we don't have an HSS configured.
Merge remote-tracking branch 'origin/master'