fold in local FLVC changes to 7.x refresh
getting it up-to-date
pulling in recent islandora changes
our version of 7.x had flvc changes merged in; that was a mistake.  Here I've replaced our changes with the originals (really only one file), though that means we need to update the flvc version from upstream/7.x, not our 7.x
Merge remote branch 'upstream/7.x' into 7.x
Merge commit '5b2449914aeb472b0103c404096432405a752077' into flvc