[PATCH] Fix failing deployment cucumber tests