merge r17469-17471 to 8.09 - fixes failsafe mode on fonera+ and fonera 2.0