Switch to Cloud 5

Cloud 4 is now maintained in releases/stoney/master subdirectory
Merge pull request #2064 from dirkmueller/master

Switch to Cloud 5