EUCA-7653
Set separate attribute for display, since 'measure' is used to determine what adjustment_type is supposed to be.
Merge branch 'testing' into EUCA-7653

Conflicts:
	static/js/views/ui/editpolicies/template.html
Merge pull request #95 from eucalyptus/EUCA-7653

Euca 7653 - use different attribute for display of the value in 'measure'... other things depend on it.