Merge "BUG:5021 ELan datapath code-changes and cleanUp some code." into stable/beryllium