Renamed ID attribute for capabilities disco info request
Refactor resource handling in available handler
Refactor show and status stanza handling
Refactor getting caps_key
Merge remote-tracking branch 'upstream/master'