handle expiry date default and display as spec'ed
handle constraint default settings
Merge pull request #484 from nla/sc-dsc-279-defects

handle expiry date default and display as spec'ed
merging master