Merge "Add persistent storage for DCAE Cloudify Manager"