Merge pull request sodafoundation#730 from opensds/development

Merge development into master branch to publish Capri m-3

Merge pull request sodafoundation#636 from opensds/development

Merge development to master branch to publish Capri Milestone-2

Merge pull request sodafoundation#607 from opensds/development

Merge from Development to Master

Merge pull request sodafoundation#567 from opensds/development

Merge from Development to Master branch to prepare for Bali RC2 release

Merge pull request sodafoundation#567 from opensds/development

Merge from Development to Master branch to prepare for Bali RC2 release

Merge pull request sodafoundation#560 from opensds/development

Merge from Development to Master to prepare for Bali RC release

Merge pull request sodafoundation#542 from opensds/development

Merge Development to Master to prepare for Milestone-3 release

Merge pull request sodafoundation#530 from opensds/development

Merge one more commit from Development to Master for Milestone-2

Merge pull request sodafoundation#513 from opensds/development

Merge development into master branch for publishing Bali milestone-1

Merge pull request sodafoundation#510 from wisererik/stable/aruba

Bugs backport from master to stable/aruba