reordered access of options in tooltip and popover to allow overriding data attrs from js
fix typo
Merge pull request #6783 from joprice/popoverOptionsOverride

reordered access of options in tooltip and popover