Merge proposals dependent on lp://staging/~karni/ubuntuone-files-java-library/cleanup-and-headers

1. cleanup-and-headers
2. Dependent merge proposals