Prepare release 3.0.4

Release 3.0.3 was repeated

Change-Id: I7313ee78ca8b8e1ac72b7d862461a75039e53c3c