[releasemanager] Merge tags/3.0.4 into develop
[releasemanager] bumping version to 3.0.5
[releasemanager] Merge release/3.0.5 into master