Merge pull request #2721 from mogulapranay-freescale/xl2tpd-demand-option