Incorrect merging for session-timeout in sip.xml

SipJBossContextConfig does not properly merge sip.xml session-config settings.
Update issue 210
Update issue 210
Javadoc update
Fixes issue 215
Merge remote-tracking branch 'origin/issue-209'