Agova 35/34

Both 34 and 35 in same PR. Rely on 35 fix in agorava-parent

https://github.com/agorava/agorava-parent/pull/2