Switch common branch to morphis/hybris-rework

Signed-off-by: Simon Busch <morphis@gravedo.de>