Fixing 017.cf and moving it out of staging.
Fixing 018.cf and moving it out of staging.
Fixing 031.cf and moving it out of staging.
Updating comments on the test file

This test shows a bug in our implementation. Please look at
https://cfengine.com/dev/issues/3506 for more info.
Fixing 036.cf and moving it out of staging.
Fixing 037.cf and moving it out of staging.