Merge "Continue process boot even if 'idmap2 --scan' fails"