Fix kwargs going into ResourceDefinition

Don't use positional args for kwargs as the ordering can create bugs.

part of blueprint external-resources
Change-Id: I2a494d34d7eab3df6bf5daa9da15a65ea45bf56c
Fix [H302] errors in heat/common

Change-Id: Id72426a6f921002630ad74ed00166885fb2ddf37
Merge "Fix kwargs going into ResourceDefinition"
Merge "Fix [H302] errors in heat/common"