DM-1467 changes for ApertureFlux on new C++ design.
Remove typename from code which was formerly templated but isn't any longer.
Changes for review of DM-1467
Merge branch 'master' into u/pgee/DM-1467b
Merge branch 'u/pgee/DM-1467b'