SRAMP-29 StoredQuery support

This is the first time the CND has changed since the first FSW version - this change may require an upgrade path.