STORM-525: add project DOAP file
Merge remote-tracking branch 'apache/master'
Merge branch 'master' into retries