Use deprecated matcher as long as specinfra and serverspec not updated

Workaround number 2 for #751 
Depends on #752