am 9fadca71: (-s ours) am b766ab83: DO NOT MERGE Add deprecated annotation to...
am 9fadca71: (-s ours) am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Merge commit '9fadca71'
* commit '9fadca71':
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml