Forward port the Metrics_Removal work to master branch

For AGPUSH-2083 lot's of changes are in place for the 1..1x branch. Those need to be applied to the master branch.

When porting we should also use java8 syntax where possible, since the master branch is java8 only