Fixed building incrementals and removed now obsolete code.

FullOTA_DisableRecoveryUpdate can be replaced by --no_separate_recovery=true.
Unfortunately there's a bug (access to undefined variables) when that parameter is specified -> solved this one as well.