Fix logic for ict passed to config for warm starts.
Add in tests to capture this bug in future.
Merge pull request #677 from arjclark/fix.warmstart-preinit

fix pre-initial cycling under warm start with different ict
Merge remote branch 'upstream/master' into test-user-at-host