Call configtest on reload too
Update keywords
Merge branch '5.8p2'

* 5.8p2:
  Update keywords
  Call configtest on reload too