The nodepool_id feature may need to be removed. I've kept it to simplify merging both now and if we do it again later. A couple of the tests are disabled and need reworking in a subsquent commit. Change-Id: I948f9f69ad911778fabb1c498aebd23acce8c89c