reverse rbelec to rb-master

Changes needed to revert the rbelec-master to the rb-master