grouper/tilapia: Update to 4.2.2 props

Tilapia needs to be verified, grouper is OK.

Change-Id: I21de84f3771af9727e48654972c3d74e4cf93154
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1