1.8.x

Small changes to support version 1.8.x. These changes have been tested against Orchard 1.8.x branch.