Fix includes due to new jar versions (!10 · Merge requests · EIP / Labrador / Queue

Merged Otto Visser requested to merge cherry-pick-0de9defd into 16-edit-remove-buttons-not-displaying-properly Aug 10, 2017

Can't show this merge request because the source branch cherry-pick-0de9defd is missing from project eip/labrador/queue. Close this merge request or update the source branch.