Fixed CRLF --> LF
Fixed CRLF-->LF eli
Merge branch 'master' into CLOUDIFY-1526-Dynamic-storage-allocation