at least this should be done in separated commit with a meaningful message that stay separated when you'll merge this PR.
Note: I know the manual rebuild is painful, this step will be automated by travis or our CI server soon (https://jira.ez.no/browse/EZP-21197)