Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev