Merge branch 'fp2-1985' into 'master'

FPII-1985: FP Updater: Fix beta mode

Remove incorrect beta mode logic.

See merge request !26