Fix some merge conflicts in cherry-picking 1f2883c5d8ff7b8976778b857e5c5db55804823a from trunk. Patch by Matt Ezell for better handling/unit testing the release of ALPS reservations.
Fix a conflict when cherry-picking 9d6ec0afa08904379d5cce1af4232b14dd825326 from trunk. This is a change by Matt Ezell which makes it so the the mic path is only included if you're compiling with mics enabled.