Merge commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c' into kraken * commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c': Fix 2656989. Clean up update to updated system applications.
Merge commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c' into kraken * commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c': Fix 2656989. Clean up update to updated system applications.