OOIION-1784: Support for efficient facility list
Merge pull request #510 from mmeisinger/add1784_faclist_r2

OOIION-1784: Support for efficient facility list