Updated to reflect Push Java Client changes
Merge branch 'fix_compilation'