Remove unnecessary check for capabilities
Update comment in UT
Fix indent and comment
Merge pull request #439 from Metaswitch/iss434

[Reviewer: Mike] Remove extra check for capabilities