add site extension changes to support SAF site structure
Merge pull request #942 from MauriceManning/siteextended

add site extension changes to support SAF site structure