mcf: recover_current_mcf_state preserve some arguments

:Release Notes:
This is cleaner implementation than applying the options directly in
getopts() call.

:Detailed Notes:

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[GF-54390] mcf: Support updating HEAD from rebased branches

Open-webOS-DCO-1.0-Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Change-Id: I1723156dad6481b28db82f6c367f531ab44cdfe0
Reviewed-on: https://g2g.palm.com/4767
Reviewed-by: DCO Verification
Reviewed-by: Martin Jansa <Martin.Jansa@lge.com>
Tested-by: Martin Jansa <Martin.Jansa@lge.com>
Reviewed-by: Susan Montooth <susan.montooth@lge.com>