Merge pull request sodafoundation#160 from opensds/development

Merge Development to Master

Merge pull request sodafoundation#160 from opensds/development

Merge Development to Master

Merge pull request sodafoundation#160 from opensds/development

Merge Development to Master

Merge pull request sodafoundation#145 from opensds/development

Merge development into master branch to publish Capri RC-02

Merge pull request sodafoundation#133 from opensds/development

Merge development into master branch for publishing Capri RC-01

Merge pull request sodafoundation#125 from opensds/development

Merge from Development to Master to prepare for m-3

Merge pull request sodafoundation#109 from opensds/development

Merge development to master branch to publish Capri Milestone-2

Merge pull request sodafoundation#100 from opensds/development

Merge from Development to Master to prepare for milestone-1

Merge pull request sodafoundation#88 from sfzeng/master

Bug fix: Make the max run time of a migration job to be configurable.

Merge pull request sodafoundation#88 from sfzeng/master

Bug fix: Make the max run time of a migration job to be configurable.