Upgraded version of fenix to 2.1.2. Upgraded version of fenix-ist to 1.0.4
Bumped version for release of 21
Merge branch 'release/21' into develop