More fixes

[lolmaus]

Regarding build failure with floating dependencies: this seems to be an issue upstream:
emberjs/ember.js#18831

[simonihmig]

Regarding build failure with floating dependencies: this seems to be an issue upstream

Yes, had to fix this in a few of our addons. Upgrading to Ember 3.16 should do it!

[simonihmig]

@lolmaus I added one commit here, that should fix the remaining build error. Was caused by a linting error in .ember-cli.js. But the changes to that file have been reverted in the ember-cli blueprint itself. Seems ember-cli-update did not catch this. So this commit does the same revert, making the file again match the official blueprint (see https://github.com/ember-cli/ember-cli/blob/master/blueprints/app/files/.ember-cli)

When this is green, we should merge it.

[lolmaus]

Yay, thanks for looking into this!