Wave 0.4 rc6

Please review the changes for the RC6 release candidate. 
In order to release we need ensure that all files have the license header (besides those that can't like the eclipse-formatter.xml which gets corrupted by header).
Also, we must ensure that we follow the Apache licensing guidelines - http://www.apache.org/dev/licensing-howto.html