Feature #1797: Update states-complete.dot
(cherry picked from commit dbd1aabe8c2eea47c84626898b99e02788803b75)
Update xsd files
(cherry picked from commit 78db804413f00da0f3332d339415806ea198b41d)
Merge branch 'feature-1839'
Make build system work with ruby 2.0
(cherry picked from commit c885df333df4194a23ed9fa4a1c16a1ecf75b56e)
Merge remote-tracking branch 'origin/one-4.0'

Sync branches
Merge remote-tracking branch 'origin/one-4.0'

Sync branches
Feature #1068: Fix unnecessary use of sudo in the Ceph drivers(cherry picked from commit 85eeb4b240881f1918b37ab2ee7c201e311cd474)
Merge remote-tracking branch 'origin/one-4.0'

Sync with one-4.0 branch
feature #1820: Add new views_config files
Merge remote-tracking branch 'origin/one-4.0'

Sync with one-4.0 branch
feature #1820: Improve configurable views
Merge remote-tracking branch 'origin/one-4.0'

Sync with one-4.0 branch
Merge branch 'master' into feature-1820

Conflicts:
	src/sunstone/public/js/plugins/files-tab.js