Refactoring for bugzid 3833, 3443 - should use existing AWSCloud#encode().
Merge pull request #89 from maksimov/develop

Refactoring for bugzid 3833, 3443 - should use existing AWSCloud#encode(...