Merge pull request #1660 from stevewithington/candidate

bug fix: ignore empty keys when setting bean props