Handle new Not Subscribed trial period message

This branch was created only to force building storage-client so the latest subscription-status is brought in.

It will have the references to branches removed before deploying to production.

@EnlightenedCode please review