Carry through changes of Islandora constants.
Merge pull request #18 from adam-vessey/7.x-constants

Carry through changes of Islandora constants.
Merge remote branch 'upstream/7.x' into flvc