Fix Issue #136
Merge branch 'master' of https://github.com/Netflix/ribbon into cp
Upgrade mock version
Change the dependency on rxjava to a new format.
Merge pull request #137 from allenxwang/cp

Fix #136
Added ClientConfigFactory and RibbonTransportFactory
More updates.
HttpRequest.replaceUri now includes the entity when building the new instance
Merge pull request #140 from willblackie/wb_replaceUriFix

HttpRequest.replaceUri now includes the entity when building the new instance
Make RibbonTransportFactory and ClientConfigFactory injected to HttpResourceGroupFactory
Merge branch 'master' of https://github.com/Netflix/ribbon into di
Merge with allen's fixes
Merge branch 'allenxwang-eran-di'