RF-12972: Re-ordered resource statements placing the library before the name
RF-13008: Regexp fixes to resource libraries
RF-13008: Manual fixes to resource libraries