Standardized default value across both spec versions

Fix for #731 and #698.  Now default values will properly appear in both 1.2 and 2.0 spec versions