Bug #1800: Ignore LCM::MONITOR_DONE when the VM is in poweroff or suspended states
Bug #1800: Update disabled hosts with empty monitorization values
Feature #1797: Update states-simple.dot
feature #1825: Add nic refresh.

Still getting errors, trying two approachs
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)
feature #1825: Refresh for all datatables in the create template dialog
feature #1825: Standing selection on datatable refresh
bug #1858: Fix losing selection upon refresh on cluster create dialog
bug #1822: delete .isofiles on error in context script
Merge remote-tracking branch 'origin/one-4.0'

Sync with one-4.0 branch
feature #1778: added more info to --memory for template creation
feature #1860: group membership field name configurable for ldap
Remove TEMPLATE_NAME from VM template (prevents inconsistent name references because of renaming the original template)
bug #1824: Show correct types in files tab