Minor policy precondition fixes and resource_lifecycle policy changes