[SR-Dev] git:janakj/oracle: Merge branches 'janakj/oracle' and 'master' of ssh:// janakj@git.sip-router.org/sip-router into oracle