Merge pull request #178 from maksimov/develop

FB4960: Oracle SID is not available and more