Auto scaling column name fix - EUCA-5896

Remove use of nested @Embedded in an @ElementCollection so that the
@Column annotations are respected.

EUCA-5896
Auto scaling activity description is optional - EUCA-5897

EUCA-5897
Merge remote-tracking branch 'origin/dev/sjones/EUCA-5897_bonus' into testing