CLOUDIFY-1888 rewrite/commit files that were somehow lost in the git maze (or: how could I have been so foolish)