Merge "Container aware osgi commands for FRM"