User file loading: Upgrade file to version 12 of the user file

Change-Id: I7ff429c1c82a036b944c71f5b2f969e1c6db6956
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Git: Display tracking branch for newly created branches

+ Get rid of a workaround done for retrieving sha

Change-Id: I4b7a6c6d9e9be5766f4fc540dc8b15037eb7948c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>