hide grace period wording if there is no grace period
Merge branch 's3-gold' into staging
upload to 20140217163954